paginator: fix switching to sequential pagination.

Fix a bug where the paginator didn't correctly switch to sequential pagination when reaching the page limit.
danbooru · Feb 19, 2021 · 981d56c · 981d56c
1 parent 4e6dff7
commit 981d56c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/components/paginator_component.rb b/app/components/paginator_component.rb
@@ -12,7 +12,7 @@ def initialize(records:, params:, window: 4)
   end
 
   def use_sequential_paginator?
-    paginator_mode != :numbered || current_page >= paginator_page_limit
+    paginator_mode != :numbered
   end
 
   def pages

diff --git a/app/logical/pagination_extension.rb b/app/logical/pagination_extension.rb
@@ -20,10 +20,14 @@ def paginate(page, limit: nil, max_limit: 1000, page_limit: CurrentUser.user.pag
     elsif page.to_s =~ /\Aa(\d+)\z/i
       @paginator_mode = :sequential_after
       paginate_sequential_after($1, records_per_page)
+    elsif page.to_i > page_limit
+      raise PaginationError
+    elsif page.to_i == page_limit
+      @paginator_mode = :sequential_after
+      paginate_numbered(page.to_i, records_per_page)
     else
       @paginator_mode = :numbered
       @current_page = [page.to_i, 1].max
-      raise PaginationError if current_page > page_limit
 
       paginate_numbered(current_page, records_per_page)
     end