Fix total_count on loaded relation
This commit is contained in:
parent
4727eda199
commit
59a550e932
|
@ -21,8 +21,7 @@ module Kaminari
|
||||||
# Total count has to be 0 if loaded records are 0
|
# Total count has to be 0 if loaded records are 0
|
||||||
return @total_count = 0 if (current_page == 1) && @records.empty?
|
return @total_count = 0 if (current_page == 1) && @records.empty?
|
||||||
# Total count is calculable at the last page
|
# Total count is calculable at the last page
|
||||||
per_page = (defined?(@_per) && @_per) || default_per_page
|
return @total_count = (current_page - 1) * limit_value + @records.length if @records.any? && (@records.length < limit_value)
|
||||||
return @total_count = (current_page - 1) * per_page + @records.length if @records.any? && (@records.length < per_page)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# #count overrides the #select which could include generated columns referenced in #order, so skip #order here, where it's irrelevant to the result anyway
|
# #count overrides the #select which could include generated columns referenced in #order, so skip #order here, where it's irrelevant to the result anyway
|
||||||
|
|
|
@ -30,7 +30,7 @@ if defined? ActiveRecord
|
||||||
assert_equal 7, User.page(2).per(2).total_count
|
assert_equal 7, User.page(2).per(2).total_count
|
||||||
end
|
end
|
||||||
|
|
||||||
test 'total_count on loded Relation' do
|
test 'total_count on loaded Relation' do
|
||||||
assert_equal 0, User.where('1 = 0').page(1).load.total_count
|
assert_equal 0, User.where('1 = 0').page(1).load.total_count
|
||||||
assert_equal 0, User.where('1 = 0').page(1).per(10).load.total_count
|
assert_equal 0, User.where('1 = 0').page(1).per(10).load.total_count
|
||||||
assert_equal 7, User.page(1).load.total_count
|
assert_equal 7, User.page(1).load.total_count
|
||||||
|
@ -38,6 +38,12 @@ if defined? ActiveRecord
|
||||||
assert_equal 7, User.page(2).load.total_count
|
assert_equal 7, User.page(2).load.total_count
|
||||||
assert_equal 7, User.page(2).per(10).load.total_count
|
assert_equal 7, User.page(2).per(10).load.total_count
|
||||||
assert_equal 7, User.page(2).per(2).load.total_count
|
assert_equal 7, User.page(2).per(2).load.total_count
|
||||||
|
|
||||||
|
old_max_per_page = User.max_per_page
|
||||||
|
User.max_paginates_per(5)
|
||||||
|
assert_equal 7, User.page(1).per(100).load.total_count
|
||||||
|
assert_equal 7, User.page(2).per(100).load.total_count
|
||||||
|
User.max_paginates_per(old_max_per_page)
|
||||||
end
|
end
|
||||||
|
|
||||||
test 'it should reset total_count memoization when the scope is cloned' do
|
test 'it should reset total_count memoization when the scope is cloned' do
|
||||||
|
|
Loading…
Reference in New Issue