Merge remote-tracking branch 'upstream/pull/4142'

[rails.git] / app / views / traces / _trace_paging_nav.html.erb

diff --git a/app/views/traces/_trace_paging_nav.html.erb b/app/views/traces/_trace_paging_nav.html.erb
index 25e35d2266d76beec4f590437a7285d9d1670450..29e0d37f622e0160a2b882fb90e454411f62a81e 100644 (file)
--- a/app/views/traces/_trace_paging_nav.html.erb
+++ b/app/views/traces/_trace_paging_nav.html.erb
@@ -1,8 +1,8 @@
 <nav>
   <ul class="pagination">
-    <% if page > 1 %>
+    <% if newer_traces %>
       <li class="page-item">
-        <%= link_to t(".newer"), params.merge(:page => page - 1), :class => "page-link" %>
+        <%= link_to t(".newer"), params.merge(:before => nil, :after => traces.first.id), :class => "page-link" %>
       </li>
     <% else %>
       <li class="page-item disabled">
@@ -10,17 +10,13 @@
       </li>
     <% end %>
 
-    <li class="page-item disabled">
-      <span class="page-link"><%= t(".showing_page", :page => page) %></span>
-    </li>
-
-    <% if traces.size < page_size %>
-      <li class="page-item disabled">
-        <span class="page-link"><%= t(".older") %></span>
+    <% if older_traces %>
+      <li class="page-item">
+        <%= link_to t(".older"), params.merge(:before => traces.last.id, :after => nil), :class => "page-link" %>
       </li>
     <% else %>
-      <li class="page-item">
-        <%= link_to t(".older"), params.merge(:page => page + 1), :class => "page-link" %>
+      <li class="page-item disabled">
+        <span class="page-link"><%= t(".older") %></span>
       </li>
     <% end %>
   </ul>