From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Sep 2023 17:42:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4225'
X-Git-Tag: live~1571
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f138055849e5b09cd94797c3e1705c6357d6b93b?hp=1220a9930e7e3d9662a9a7ba49d320fdbe1a1021

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

diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index 4a8beab37..e95b31bb2 100644
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -38,23 +38,23 @@
 
   <nav>
     <ul class="pagination">
-      <% if @older_entries -%>
+      <% if @newer_entries -%>
         <li class="page-item">
-          <%= link_to t(".older_entries"), @params.merge(:before => @entries.last.id), :class => "page-link" %>
+          <%= link_to t(".newer_entries"), @params.merge(:after => @entries.first.id), :class => "page-link" %>
         </li>
       <% else -%>
         <li class="page-item disabled">
-          <span class="page-link"><%= t(".older_entries") %></span>
+          <span class="page-link"><%= t(".newer_entries") %></span>
         </li>
       <% end -%>
 
-      <% if @newer_entries -%>
+      <% if @older_entries -%>
         <li class="page-item">
-          <%= link_to t(".newer_entries"), @params.merge(:after => @entries.first.id), :class => "page-link" %>
+          <%= link_to t(".older_entries"), @params.merge(:before => @entries.last.id), :class => "page-link" %>
         </li>
       <% else -%>
         <li class="page-item disabled">
-          <span class="page-link"><%= t(".newer_entries") %></span>
+          <span class="page-link"><%= t(".older_entries") %></span>
         </li>
       <% end -%>
     </ul>
diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index ea918cb6b..b505d9cdb 100644
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -568,28 +568,28 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     assert_select "li.page-item.disabled span.page-link", :text => "Newer Entries", :count => 1
 
     # Try and get the second page
-    get css_select("li.page-item a.page-link").first["href"]
+    get css_select("li.page-item .page-link").last["href"]
     assert_response :success
     assert_select "article.diary_post", :count => 20
     assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1
     assert_select "li.page-item a.page-link", :text => "Newer Entries", :count => 1
 
     # Try and get the third page
-    get css_select("li.page-item a.page-link").first["href"]
+    get css_select("li.page-item .page-link").last["href"]
     assert_response :success
     assert_select "article.diary_post", :count => 10
     assert_select "li.page-item.disabled span.page-link", :text => "Older Entries", :count => 1
     assert_select "li.page-item a.page-link", :text => "Newer Entries", :count => 1
 
     # Go back to the second page
-    get css_select("li.page-item a.page-link").last["href"]
+    get css_select("li.page-item .page-link").first["href"]
     assert_response :success
     assert_select "article.diary_post", :count => 20
     assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1
     assert_select "li.page-item a.page-link", :text => "Newer Entries", :count => 1
 
     # Go back to the first page
-    get css_select("li.page-item a.page-link").last["href"]
+    get css_select("li.page-item .page-link").first["href"]
     assert_response :success
     assert_select "article.diary_post", :count => 20
     assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1