Merge ac906e7 into 0fdb245

railsadminteam · Apr 10, 2014 · aa5b655 · aa5b655
2 parents 0fdb245 + ac906e7
commit aa5b655
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/rails_admin/adapters/active_record.rb b/lib/rails_admin/adapters/active_record.rb
@@ -5,7 +5,6 @@ module RailsAdmin
   module Adapters
     module ActiveRecord
       DISABLED_COLUMN_TYPES = [:tsvector, :blob, :binary, :spatial, :hstore, :geometry]
-      DISABLED_COLUMN_MATCHERS = [/_array$/]
 
       def new(params = {})
         AbstractObject.new(model.new(params))
@@ -57,7 +56,7 @@ def properties
         columns = model.columns.reject do |c|
           c.type.blank? ||
             DISABLED_COLUMN_TYPES.include?(c.type.to_sym) ||
-            DISABLED_COLUMN_MATCHERS.any? { |matcher| matcher.match(c.type.to_s) }
+            c.try(:array)
         end
         columns.collect do |property|
           Property.new(property, model)