Improve the fix in #3088

railsadminteam · Jan 26, 2019 · 7d4fd21 · 7d4fd21
1 parent 1628a0d
commit 7d4fd21
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/rails_admin/config/fields/factories/active_storage.rb b/lib/rails_admin/config/fields/factories/active_storage.rb
@@ -1,10 +1,9 @@
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'
-require 'rails_admin/adapters/active_record/association'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  if defined?(::ActiveStorage) && properties.is_a?(RailsAdmin::Adapters::ActiveRecord::Association) && (match = /\A(.+)_attachments?\Z/.match properties.name) && properties.klass.to_s == 'ActiveStorage::Attachment'
+  if defined?(::ActiveStorage) && properties.try(:association?) && (match = /\A(.+)_attachments?\Z/.match properties.name) && properties.klass.to_s == 'ActiveStorage::Attachment'
     name = match[1]
     field = RailsAdmin::Config::Fields::Types.load(
       properties.type == :has_many ? :multiple_active_storage : :active_storage,