does not exist unless ed. Closes #1674

railsadminteam · Oct 4, 2015 · aad913c · aad913c
1 parent 0a36dc0
commit aad913c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/lib/rails_admin/config/fields/factories/paperclip.rb b/lib/rails_admin/config/fields/factories/paperclip.rb
@@ -5,7 +5,7 @@
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   extensions = [:file_name, :content_type, :file_size, :updated_at, :fingerprint]
   model = parent.abstract_model.model
-  if (properties.name.to_s =~ /^(.+)_file_name$/) && defined?(::Paperclip) && model.attachment_definitions && model.attachment_definitions.key?(attachment_name = Regexp.last_match[1].to_sym)
+  if (properties.name.to_s =~ /^(.+)_file_name$/) && defined?(::Paperclip) && model.try(:attachment_definitions) && model.attachment_definitions.key?(attachment_name = Regexp.last_match[1].to_sym)
     field = RailsAdmin::Config::Fields::Types.load(:paperclip).new(parent, attachment_name, properties)
     children_fields = []
     extensions.each do |ext|

diff --git a/spec/rails_admin/config/fields/types/paperclip_spec.rb b/spec/rails_admin/config/fields/types/paperclip_spec.rb
@@ -2,4 +2,17 @@
 
 describe RailsAdmin::Config::Fields::Types::Paperclip do
   it_behaves_like 'a generic field type', :string_field, :paperclip
+
+  context 'when a *_file_name field exists but not decleared as has_attached_file' do
+    before do
+      class PaperclipTest < Tableless
+        column :some_file_name, :varchar
+      end
+      RailsAdmin.config.included_models = [PaperclipTest]
+    end
+
+    it 'does not break' do
+      expect{ RailsAdmin.config(PaperclipTest).fields }.not_to raise_error
+    end
+  end
 end