From d6d6f62c82d0ca2595805a2f645fd8b40e0f1411 Mon Sep 17 00:00:00 2001 From: Andrew Nesbitt Date: Sun, 14 Apr 2024 11:33:13 -0700 Subject: [PATCH] Update pagination method in CommittersController#index and CommittersController#show --- app/controllers/committers_controller.rb | 4 ++-- app/views/committers/show.html.erb | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/committers_controller.rb b/app/controllers/committers_controller.rb index ac5d7c6..ea4da8b 100644 --- a/app/controllers/committers_controller.rb +++ b/app/controllers/committers_controller.rb @@ -10,7 +10,7 @@ def index scope = scope.order(Arel.sql(sort).desc.nulls_last) end - @pagy, @committers = pagy(scope) + @pagy, @committers = pagy_countless(scope) end def show @@ -23,6 +23,6 @@ def show end end raise ActiveRecord::RecordNotFound unless @committer - @pagy, @repositories = pagy(@committer.repositories) + @pagy, @repositories = pagy_countless(@committer.repositories) end end \ No newline at end of file diff --git a/app/views/committers/show.html.erb b/app/views/committers/show.html.erb index f5e875e..1f555a6 100644 --- a/app/views/committers/show.html.erb +++ b/app/views/committers/show.html.erb @@ -10,10 +10,11 @@ <% end %> + <% if @committer.commits_count > 0 %>

Total Commits: <%= number_with_delimiter @committer.commits_count %>
- Repositories: <%= number_with_delimiter @pagy.count %>

+ <% end %> <%= render @repositories %> <%== pagy_bootstrap_nav(@pagy) if @pagy.pages > 1 %>