Skip to content

Commit

Permalink
Merge 38e2d4c into dabd8b3
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaelsales committed Apr 3, 2018
2 parents dabd8b3 + 38e2d4c commit 0eba66d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/active_admin/resource_controller/decorators.rb
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def self.wrap(decorator)
def self.wrap!(parent, name)
::Class.new parent do
delegate :reorder, :page, :current_page, :total_pages, :limit_value,
:total_count, :total_pages, :to_key, :group_values, :except,
:total_count, :offset, :to_key, :group_values, :except,
:find_each, :ransack

define_singleton_method(:name) { name }
Expand Down
2 changes: 1 addition & 1 deletion lib/active_admin/views/components/paginated_collection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def build_pagination
options[:params] = @params if @params
options[:param_name] = @param_name if @param_name

if !@display_total && collection.respond_to?(:offset)
if !@display_total
# The #paginate method in kaminari will query the resource with a
# count(*) to determine how many pages there should be unless
# you pass in the :total_pages option. We issue a query to determine
Expand Down

0 comments on commit 0eba66d

Please sign in to comment.