diff --git a/lib/active_admin/resource_controller/data_access.rb b/lib/active_admin/resource_controller/data_access.rb index dd9fcb3f72a..bad78f3f0a5 100644 --- a/lib/active_admin/resource_controller/data_access.rb +++ b/lib/active_admin/resource_controller/data_access.rb @@ -267,18 +267,23 @@ def current_scope end def apply_pagination(chain) - page_method = Kaminari.config.page_method_name - page_param = params[Kaminari.config.param_name] + page_method_name = Kaminari.config.page_method_name + page = params[Kaminari.config.param_name] - chain.send(page_method, page_param).per(per_page) + chain.send(page_method_name, page).per(per_page) end def per_page + return max_csv_records if request.format == 'text/csv' return max_per_page if active_admin_config.paginate == false @per_page || active_admin_config.per_page end + def max_csv_records + 10_000 + end + def max_per_page 10_000 end