Merge branch '6917-admin-print-view' into develop

mysociety · Nov 9, 2022 · c2b1b37 · c2b1b37
2 parents 8ef6bc2 + b5a76b4
commit c2b1b37
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 11 deletions.
diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb
@@ -17,4 +17,4 @@
   </div>
 </div>
 
-<%= will_paginate(@tags, class: 'paginator') %>
+<%= will_paginate(@tags) %>
diff --git a/app/views/admin/tags/show.html.erb b/app/views/admin/tags/show.html.erb
@@ -35,4 +35,4 @@
   </div>
 </div>
 
-<%= will_paginate(@taggings, class: 'paginator') %>
+<%= will_paginate(@taggings) %>
diff --git a/app/views/admin/users/sign_ins/index.html.erb b/app/views/admin/users/sign_ins/index.html.erb
@@ -16,4 +16,4 @@
 <%= render partial: 'admin/users/sign_in_table',
            locals: { sign_ins: @sign_ins } %>
 
-<%= will_paginate(@sign_ins, class: 'paginator') %>
+<%= will_paginate(@sign_ins) %>
diff --git a/app/views/admin_announcements/index.html.erb b/app/views/admin_announcements/index.html.erb
@@ -9,4 +9,4 @@
 <%= render partial: 'show',
            locals: { announcements: @announcements } %>
 
-<%= will_paginate(@announcements, class: 'paginator' ) %>
+<%= will_paginate(@announcements) %>
diff --git a/app/views/admin_comment/index.html.erb b/app/views/admin_comment/index.html.erb
@@ -12,4 +12,4 @@
 <%= render partial: 'admin_request/some_annotations' ,
            locals: { comments: @comments } %>
 
-<%= will_paginate(@comments, class: 'paginator') %>
+<%= will_paginate(@comments) %>
diff --git a/app/views/admin_general/timeline.html.erb b/app/views/admin_general/timeline.html.erb
@@ -80,7 +80,7 @@
     <% end %>
 <% end %>
 
-<%= will_paginate(@events, :class => 'paginator') %>
+<%= will_paginate(@events) %>
 
 <% if not @events.empty? %>
   </p>

diff --git a/app/views/admin_public_body/index.html.erb b/app/views/admin_public_body/index.html.erb
@@ -47,4 +47,4 @@
   <%= render :partial => 'one_list', :locals => { :bodies => @public_bodies, :table_name => 'substring' } %>
 <% end %>
 
-<%= will_paginate(@public_bodies, :class => "paginator") %>
+<%= will_paginate(@public_bodies) %>
diff --git a/app/views/admin_request/_some_requests.html.erb b/app/views/admin_request/_some_requests.html.erb
@@ -1,4 +1,8 @@
 <div class="accordion" id="requests">
-  <%= render partial: 'admin_request/info_request', collection: info_requests %>
+  <% if info_requests.any? %>
+    <%= render partial: 'admin_request/info_request', collection: info_requests %>
+    <%= will_paginate(info_requests) %>
+  <% else %>
+    <p>None yet.</p>
+  <% end %>
 </div>
-<%= will_paginate(info_requests, :class => "paginator") %>
diff --git a/app/views/admin_track/index.html.erb b/app/views/admin_track/index.html.erb
@@ -9,7 +9,7 @@
 
 <%= render :partial => 'some_tracks', :locals => { :track_things => @admin_tracks } %>
 
-<%= will_paginate(@admin_tracks, :class => "paginator" ) %>
+<%= will_paginate(@admin_tracks) %>
 
 <h2>Current top tracks:</h2>
 <ol>

diff --git a/app/views/admin_user/_user_table.html.erb b/app/views/admin_user/_user_table.html.erb
@@ -54,5 +54,5 @@
 <% end %>
 </div>
 
-<%= will_paginate(users, :class => "paginator") %>
+<%= will_paginate(users) %>
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,4 +17,4 @@ @@
       </div>
     </div>
-    <%= will_paginate(@tags, class: 'paginator') %>
+    <%= will_paginate(@tags) %>