Patch 1, uncomment methods that are still used in activeadmin

lib/active_admin/mongoid.rb

@@ -16,7 +16,6 @@
 require 'active_admin/mongoid/criteria'
 
 require 'active_admin/mongoid/order_clause'
-require 'active_admin/mongoid/filters/formtastic_addons'
 
 module ActiveAdmin
   module Mongoid

lib/active_admin/mongoid/document.rb

@@ -47,6 +47,10 @@ class << self
 
     self.primary_key ||= :id
 
+    def column_for_attribute(name)
+      self.class.fields[name.to_sym]
+    end
+
   end
 
   module ClassMethods
@@ -92,12 +96,12 @@ module ClassMethods
 
     # Columns
 
-    # def content_columns
-    #   # cannot cache this, since changes in time (while defining fields)
-    #   fields.map(&:second).reject do |f|
-    #     f.name =~ /(^_|^(created|updated)_at)/ or Mongoid::Fields::ForeignKey === f
-    #   end
-    # end
+    def content_columns
+      # cannot cache this, since changes in time (while defining fields)
+      fields.map(&:second).reject do |f|
+        f.name =~ /(^_|^(created|updated)_at)/ or Mongoid::Fields::ForeignKey === f
+      end
+    end
 
     # def columns
     #   @columns ||= fields.map(&:second).map{ |c| ColumnWrapper.new(c) }

lib/active_admin/mongoid/helpers/collection.rb

@@ -1,18 +1,15 @@
 module ActiveAdmin
   module Helpers
     module Collection
-
-      alias original_collection_size collection_size
-      original_collection_size = instance_method(:collection_size)
-      def collection_size(collection=collection)
-        if(not collection.empty? and collection.first.class.included_modules.include?(Mongoid::Document))
-          if collection.first.class.embedded?
-            collection.count
+      def collection_size(c=collection)
+        if(not c.empty? and c.first.class.included_modules.include?(Mongoid::Document))
+          if c.first.class.embedded?
+            c.count
           else
-            collection.count(true)
+            c.count(true)
           end
         else
-          collection.count
+          c.count
         end
       end
     end