From 7d4fd21d6f8c6e2bb948c6b16f2ed8351cb46f7a Mon Sep 17 00:00:00 2001 From: "M.Shibuya" Date: Sat, 26 Jan 2019 22:51:26 +0900 Subject: [PATCH] Improve the fix in #3088 --- lib/rails_admin/config/fields/factories/active_storage.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/rails_admin/config/fields/factories/active_storage.rb b/lib/rails_admin/config/fields/factories/active_storage.rb index e564752593..4cc04ddb5a 100644 --- 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,