Merge branch 'master' of github.com:afimb/chouette2

3 files changed, 10 insertions, 5 deletions

diff --git a/app/controllers/exports_controller.rb b/app/controllers/exports_controller.rb
index d6e9cdf42..481a0c1f1 100644
--- a/app/controllers/exports_controller.rb
+++ b/app/controllers/exports_controller.rb
@@ -64,6 +64,10 @@ class ExportsController < ChouetteController
   
   def resource
     @export ||= export_service.find( params[:id] )
+    @line_items = @export.report.line_items
+    if @line_items.size > 500
+      @line_items = @line_items.paginate(page: params[:page], per_page: 20)
+    end
   end
 
   def collection
diff --git a/app/views/exports/show.html.erb b/app/views/exports/show.html.erb
index bc9faf3f2..fc7ef2c9a 100644
--- a/app/views/exports/show.html.erb
+++ b/app/views/exports/show.html.erb
@@ -18,7 +18,7 @@
   <div class="links">
     <%= link_to( font_awesome_classic_tag("fa-file-#{@export.filename_extension}-o") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, @export.id) ) if @export.file_path %>
   </div>
-  <%= render( partial: "shared/ie_report.html", locals: { job: @export } ) %>
+  <%= render( partial: "shared/ie_report.html", locals: { job: @export, line_items: @line_items } ) %>
 </div>
 
 <% content_for :sidebar do %>
diff --git a/app/views/shared/_ie_report_line.html.erb b/app/views/shared/_ie_report_line.html.erb
index a8399f2d2..69a12779c 100644
--- a/app/views/shared/_ie_report_line.html.erb
+++ b/app/views/shared/_ie_report_line.html.erb
@@ -25,7 +25,7 @@
       </div>
     </form>
   </p>
-  <table class="table table-hover table-striped data-table toggle-circle toggle-medium" data-filter="#filter-line"<% unless line_items.respond_to?(:total_pages) %> id="table-line" data-page-size="20"<% end %>>
+  <table class="table table-hover table-striped data-table toggle-circle toggle-medium" data-filter="#filter-line" id="table-line"<% unless line_items.respond_to?(:total_pages) %> data-page-size="20"<% end %>>
     <thead>
       <tr>
         <th><%= t(".table.line.state") %></th>
@@ -59,13 +59,14 @@
     <tfoot>
       <tr>
         <td colspan="10">
-          <% if line_items.respond_to?(:total_pages) %>
-            <%= will_paginate line_items, renderer: BootstrapPagination::Rails %>
-          <% else %>
+          <% unless line_items.respond_to?(:total_pages) %>
             <ul class="pagination pagination-centered"></ul>
           <% end %>
         </td>
       </tr>
     </tfoot>
   </table>
+  <% if line_items.respond_to?(:total_pages) %>
+    <%= will_paginate line_items, renderer: BootstrapPagination::Rails %>
+  <% end %>
 </div>