Skip to content

Commit 99999af

Browse files
committed
Merge pull request activeadmin#30 from profmaad/master
Make activeadmin-mongoid play nice with ActiveRecord Resources
2 parents 0fb5a35 + 47cae71 commit 99999af

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

lib/active_admin/mongoid/helpers/collection.rb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
module ActiveAdmin
22
module Helpers
33
module Collection
4+
5+
alias original_collection_size collection_size
6+
original_collection_size = instance_method(:collection_size)
47
def collection_size(collection=collection)
5-
collection.count(true)
8+
if(not collection.empty? and collection.first.class.included_modules.include?(Mongoid::Document))
9+
collection.count(true)
10+
else
11+
original_collection_size(collection)
12+
end
613
end
714
end
815
end

0 commit comments

Comments
 (0)