Skip to content

Commit

Permalink
Merge pull request kaminari#282 from yuki24/patch-1-for-issue-280
Browse files Browse the repository at this point in the history
Make Kaminari.config.default_per_page changeable again
  • Loading branch information
amatsuda committed Sep 8, 2012
2 parents c66ffd1 + 6887c56 commit c34bee2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/kaminari/models/configuration_methods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def max_paginates_per(val)
# This model's max +per_page+ value
# returns +max_per_page+ value unless explicitly overridden via <tt>max_paginates_per</tt>
def max_per_page
@_max_per_page ||= Kaminari.config.max_per_page
@_max_per_page || Kaminari.config.max_per_page
end
end
end
Expand Down

0 comments on commit c34bee2

Please sign in to comment.