From 73046509288a0652b4e35afe61fd31b7d16e8116 Mon Sep 17 00:00:00 2001 From: Yuki Nishijima Date: Mon, 3 Sep 2018 19:04:43 -0400 Subject: [PATCH] Deprecate #current_per_page --- kaminari-core/lib/kaminari/models/page_scope_methods.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kaminari-core/lib/kaminari/models/page_scope_methods.rb b/kaminari-core/lib/kaminari/models/page_scope_methods.rb index 1443cd3d5..a3e86db80 100644 --- a/kaminari-core/lib/kaminari/models/page_scope_methods.rb +++ b/kaminari-core/lib/kaminari/models/page_scope_methods.rb @@ -19,7 +19,8 @@ def per(num, max_per_page: nil) def max_paginates_per(new_max_per_page) @_max_per_page = new_max_per_page - per current_per_page, max_per_page: new_max_per_page + + per (defined?(@_per) && @_per) || default_per_page, max_per_page: new_max_per_page end def padding(num) @@ -54,7 +55,11 @@ def current_page # Current per-page number def current_per_page - (defined?(@_per) && @_per) || default_per_page + ActiveSupport::Deprecation.warn '#current_per_page is deprecated and will be removed in the next major ' \ + 'version. Please use #limit_value instead.' + + limit_value + # (defined?(@_per) && @_per) || default_per_page end # Next page number in the collection