Only run the file exists validation when it's a new record.

quattro004 · Aug 4, 2013 · ac74c93 · ac74c93
1 parent d311e75
commit ac74c93
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/controllers/pictures_controller.rb b/app/controllers/pictures_controller.rb
@@ -63,6 +63,9 @@ def respond_or_redirect
           redirect_to(recipe_path(@picture.imageable_id))
           return
         end
+      else
+        params[:imageable_id] = @picture.imageable_id
+        params[:imageable_type] = @picture.imageable_type
       end
       respond_with(@picture)
     end

diff --git a/app/models/picture.rb b/app/models/picture.rb
@@ -30,7 +30,7 @@ def picture_contains_data
   end
 
   def picture_doesnt_exist
-    if (Picture.find_by_name(self.name))
+    if (self.new_record? && Picture.find_by_name(self.name))
       errors.add('A picture with this filename', 'already exists')
     end
   end