Merge pull request #134 from robotmay/master

Bugfix for when deleting underneath a collection
robotmay · Jul 31, 2013 · b25be23 · b25be23
2 parents 655431a + c201a1b
commit b25be23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/models/mass_edit.rb b/app/models/mass_edit.rb
@@ -35,10 +35,10 @@ def persisted?
 
   def action
     case
+    when @action.present?
+      @action
     when collection_ids.size > 0
       'collections'
-    else
-      @action
     end
   end
 

diff --git a/spec/controllers/account/photographs_controller_spec.rb b/spec/controllers/account/photographs_controller_spec.rb
@@ -76,6 +76,7 @@
         let(:mass_edit_attributes) do
           {
             action: 'delete',
+            collection_ids: [1,2],
             photograph_ids: [not_our_photograph.id]
           }
         end