Merge pull request #2712 from carsonreinke/paper_trail

Must use page_method_name for all Kaminari pagination
railsadminteam · May 2, 2019 · 92735c8 · 92735c8
2 parents 73ce325 + 4287b83
commit 92735c8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb b/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb
@@ -121,7 +121,7 @@ def listing_for_model_or_object(model, object, query, sort, sort_reverse, all, p
           versions = versions.order(sort_reverse == 'true' ? "#{sort} DESC" : sort)
           versions = all ? versions : versions.send(Kaminari.config.page_method_name, current_page).per(per_page)
           paginated_proxies = Kaminari.paginate_array([], total_count: versions.try(:total_count) || versions.count)
-          paginated_proxies = paginated_proxies.page(current_page).per(per_page)
+          paginated_proxies = paginated_proxies.send(Kaminari.config.page_method_name, current_page).per(per_page)
           versions.each do |version|
             paginated_proxies << VersionProxy.new(version, @user_class)
           end