diff --git a/gem/lib/pagy/backend.rb b/gem/lib/pagy/backend.rb index 97aeaa520..723459816 100644 --- a/gem/lib/pagy/backend.rb +++ b/gem/lib/pagy/backend.rb @@ -38,7 +38,7 @@ def pagy_get_page(vars) # Sub-method called only by #pagy: here for easy customization of record-extraction by overriding # You may need to override this method for collections without offset|limit def pagy_get_items(collection, pagy) - collection.offset(pagy.offset).limit(pagy.items) + collection.offset(pagy.offset).limit(pagy.in) end end end diff --git a/gem/lib/pagy/extras/overflow.rb b/gem/lib/pagy/extras/overflow.rb index 4f8f91043..5eb88a7e6 100644 --- a/gem/lib/pagy/extras/overflow.rb +++ b/gem/lib/pagy/extras/overflow.rb @@ -27,7 +27,7 @@ def initialize(vars) initialize vars.merge!(page: @last) # re-run with the last page @vars[:page] = requested_page # restore the requested page when :empty_page - @offset = @items = @from = @to = 0 # vars relative to the actual page + @offset = @items = @in = @from = @to = 0 # vars relative to the actual page if defined?(Calendar) && is_a?(Calendar) # only for Calendar instances edge = @order == :asc ? @final : @initial # get the edge of the overflow side (neat, but any time would do) @from = @to = edge # set both to the edge utc time (a >=&&< query will get no records) diff --git a/test/pagy/extras/overflow_test.rb b/test/pagy/extras/overflow_test.rb index 3a2dd403b..8005afa22 100644 --- a/test/pagy/extras/overflow_test.rb +++ b/test/pagy/extras/overflow_test.rb @@ -74,7 +74,7 @@ _(pagy.page).must_equal 100 _(pagy.offset).must_equal 0 _(pagy.items).must_equal 0 - _(pagy.in).must_be_nil + _(pagy.in).must_equal 0 _(pagy.from).must_equal 0 _(pagy.to).must_equal 0 _(pagy.prev).must_equal pagy.last