Skip to content

Commit a1b56cf

Browse files
committed
Keep former behaviour for Kaminari.paginate_array
1 parent a70ac6f commit a1b56cf

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/api-pagination.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def paginate(collection, options = {})
1010

1111
case ApiPagination.config.paginator
1212
when :kaminari
13-
paginate_with_kaminari(collection, options)
13+
paginate_with_kaminari(collection, options, options[:paginate_array_options] || {})
1414
when :will_paginate
1515
paginate_with_will_paginate(collection, options)
1616
else
@@ -56,14 +56,14 @@ def total_header
5656

5757
private
5858

59-
def paginate_with_kaminari(collection, options)
59+
def paginate_with_kaminari(collection, options, paginate_array_options = {})
6060
if Kaminari.config.max_per_page && options[:per_page] > Kaminari.config.max_per_page
6161
options[:per_page] = Kaminari.config.max_per_page
6262
elsif options[:per_page] <= 0
6363
options[:per_page] = Kaminari.config.default_per_page
6464
end
6565

66-
collection = Kaminari.paginate_array(collection) if collection.is_a?(Array)
66+
collection = Kaminari.paginate_array(collection, paginate_array_options) if collection.is_a?(Array)
6767
collection.page(options[:page]).per(options[:per_page])
6868
end
6969

0 commit comments

Comments
 (0)