8000 Revert "make CSV downloads respect pagination" · lest/activeadmin@37ba46c · GitHub
[go: up one dir, main page]

Skip to content

Commit 37ba46c

Browse files
committed
Revert "make CSV downloads respect pagination"
This reverts commit a8ad4f9. Ref: activeadmin#2847
1 parent 9062494 commit 37ba46c

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

lib/active_admin/resource_controller/data_access.rb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,18 +267,23 @@ def current_scope
267267
end
268268

269269
def apply_pagination(chain)
270-
page_method = Kaminari.config.page_method_name
271-
page_param = params[Kaminari.config.param_name]
270+
page_method_name = Kaminari.config.page_method_name
271+
page = params[Kaminari.config.param_name]
272272

273-
chain.send(page_method, page_param).per(per_page)
273+
chain.send(page_method_name, page).per(per_page)
274274
end
275275

276276
def per_page
277+
return max_csv_records if request.format == 'text/csv'
277278
return max_per_page if active_admin_config.paginate == false
278279

279280
@per_page || active_admin_config.per_page
280281
end
281282

283+
def max_csv_records
284+
10_000
285+
end
286+
282287
def max_per_page
283288
10_000
284289
end

0 commit comments

Comments
 (0)
0