From e143726f1a1d38cb458c75419510ed38fc6d62db Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Mon, 4 Sep 2023 16:25:35 +0300
Subject: [PATCH] Combine comments and traces pagination partials

---
 app/controllers/diary_entries_controller.rb   |  2 +-
 app/views/diary_entries/comments.html.erb     |  9 ++++----
 app/views/diary_entries/index.html.erb        |  9 ++++----
 .../_pagination.html.erb                      |  4 ++--
 app/views/traces/_trace_paging_nav.html.erb   | 23 -------------------
 app/views/traces/index.html.erb               | 12 ++++++++--
 6 files changed, 23 insertions(+), 36 deletions(-)
 rename app/views/{diary_entries => shared}/_pagination.html.erb (76%)
 delete mode 100644 app/views/traces/_trace_paging_nav.html.erb

diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb
index 5b522988d..a1cd6ab0e 100644
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -238,7 +238,7 @@ class DiaryEntriesController < ApplicationController
     comments = DiaryComment.where(:users => @user)
     comments = comments.visible unless can? :unhidecomment, DiaryEntry
 
-    @params = params.permit(:display_name)
+    @params = params.permit(:display_name, :before, :after)
 
     @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, [:user])
   end
diff --git a/app/views/diary_entries/comments.html.erb b/app/views/diary_entries/comments.html.erb
index e1d92b6bb..f82373af0 100644
--- a/app/views/diary_entries/comments.html.erb
+++ b/app/views/diary_entries/comments.html.erb
@@ -24,8 +24,9 @@
     <% end -%>
   </table>
 
-  <%= render "pagination", :newer_key => "diary_entries.comments.newer_comments",
-                           :older_key => "diary_entries.comments.older_comments",
-                           :newer_id => @newer_comments_id,
-                           :older_id => @older_comments_id %>
+  <%= render "shared/pagination",
+             :newer_key => "diary_entries.comments.newer_comments",
+             :older_key => "diary_entries.comments.older_comments",
+             :newer_id => @newer_comments_id,
+             :older_id => @older_comments_id %>
 <% end -%>
diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index f6e2c37c5..e464b99b4 100644
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -36,10 +36,11 @@
 
   <%= render @entries %>
 
-  <%= render "pagination", :newer_key => "diary_entries.index.newer_entries",
-                           :older_key => "diary_entries.index.older_entries",
-                           :newer_id => @newer_entries_id,
-                           :older_id => @older_entries_id %>
+  <%= render "shared/pagination",
+             :newer_key => "diary_entries.index.newer_entries",
+             :older_key => "diary_entries.index.older_entries",
+             :newer_id => @newer_entries_id,
+             :older_id => @older_entries_id %>
 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>
diff --git a/app/views/diary_entries/_pagination.html.erb b/app/views/shared/_pagination.html.erb
similarity index 76%
rename from app/views/diary_entries/_pagination.html.erb
rename to app/views/shared/_pagination.html.erb
index 4a948a4f5..fbb9dcf43 100644
--- a/app/views/diary_entries/_pagination.html.erb
+++ b/app/views/shared/_pagination.html.erb
@@ -2,7 +2,7 @@
   <ul class="pagination">
     <% if newer_id -%>
       <li class="page-item">
-        <%= link_to t(newer_key), @params.merge(:after => newer_id), :class => "page-link" %>
+        <%= link_to t(newer_key), @params.merge(:before => nil, :after => newer_id), :class => "page-link" %>
       </li>
     <% else -%>
       <li class="page-item disabled">
@@ -12,7 +12,7 @@
 
     <% if older_id -%>
       <li class="page-item">
-        <%= link_to t(older_key), @params.merge(:before => older_id), :class => "page-link" %>
+        <%= link_to t(older_key), @params.merge(:before => older_id, :after => nil), :class => "page-link" %>
       </li>
     <% else -%>
       <li class="page-item disabled">
diff --git a/app/views/traces/_trace_paging_nav.html.erb b/app/views/traces/_trace_paging_nav.html.erb
deleted file mode 100644
index 29e0d37f6..000000000
--- a/app/views/traces/_trace_paging_nav.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<nav>
-  <ul class="pagination">
-    <% if newer_traces %>
-      <li class="page-item">
-        <%= link_to t(".newer"), params.merge(:before => nil, :after => traces.first.id), :class => "page-link" %>
-      </li>
-    <% else %>
-      <li class="page-item disabled">
-        <span class="page-link"><%= t(".newer") %></span>
-      </li>
-    <% end %>
-
-    <% 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 disabled">
-        <span class="page-link"><%= t(".older") %></span>
-      </li>
-    <% end %>
-  </ul>
-</nav>
diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index 26e52add7..ddbaa9e94 100644
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -66,7 +66,11 @@
 <% end %>
 
 <% if @traces.size > 0 %>
-  <%= render "trace_paging_nav", :older_traces => @older_traces, :newer_traces => @newer_traces, :traces => @traces, :params => @params %>
+  <%= render "shared/pagination",
+             :newer_key => "traces.trace_paging_nav.newer",
+             :older_key => "traces.trace_paging_nav.older",
+             :newer_id => @newer_traces && @traces.first.id,
+             :older_id => @older_traces && @traces.last.id %>
 
   <table id="trace_list" class="table table-borderless table-striped">
     <tbody>
@@ -74,7 +78,11 @@
     </tbody>
   </table>
 
-  <%= render "trace_paging_nav", :older_traces => @older_traces, :newer_traces => @newer_traces, :traces => @traces, :params => @params %>
+  <%= render "shared/pagination",
+             :newer_key => "traces.trace_paging_nav.newer",
+             :older_key => "traces.trace_paging_nav.older",
+             :newer_id => @newer_traces && @traces.first.id,
+             :older_id => @older_traces && @traces.last.id %>
 <% else %>
   <h2><%= t ".empty_title" %></h2>
   <p><%= t ".empty_upload_html", :upload_link => link_to(t(".upload_new"), new_trace_path),
-- 
2.39.5