Rails 4.2 has deprecated serialized_attributes

* Use the new `type_for_attribute` method instead
railsadminteam · Dec 24, 2014 · 698f06a · 698f06a
1 parent f8f3e02
commit 698f06a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/rails_admin/adapters/active_record/property.rb b/lib/rails_admin/adapters/active_record/property.rb
@@ -18,7 +18,7 @@ def pretty_name
         end
 
         def type
-          if model.serialized_attributes[property.name.to_s]
+          if serialized?
             :serialized
           else
             property.type
@@ -44,6 +44,16 @@ def association?
         def read_only?
           false
         end
+
+      private
+
+        def serialized?
+          if Rails.version < '4.2'
+            model.serialized_attributes[property.name.to_s]
+          else
+            model.type_for_attribute(property.name).class == ::ActiveRecord::Type::Serialized
+          end
+        end
       end
     end
   end

diff --git a/spec/integration/config/edit/rails_admin_config_edit_spec.rb b/spec/integration/config/edit/rails_admin_config_edit_spec.rb
@@ -1017,7 +1017,7 @@ def color_enum
       end
 
       after do
-        Team.serialized_attributes.clear
+        Team.serialized_attributes.clear if Rails.version < '4.2'
         Team.instance_eval { undef :color_enum }
       end