Merge pull request #7 from polinom/master

Fix delete method to work properly with amazon s3 sorage system. + Add checkbox in admin.
petry · Oct 29, 2013 · a60b454 · a60b454
2 parents 7af47a4 + e659825
commit a60b454
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/photologue/models.py b/photologue/models.py
@@ -412,7 +412,7 @@ def delete(self):
         # http://haineault.com/blog/147/
         # The data loss scenarios mentioned in the docs hopefully do not apply
         # to Photologue!
-        self.image.storage.delete(self.image)
+        self.image.storage.delete(self.image.name)
         super(ImageModel, self).delete()
 
 

diff --git a/photologue/templates/admin/photologue/photo/change_list.html b/photologue/templates/admin/photologue/photo/change_list.html
@@ -15,6 +15,7 @@
         </a>
 
         <div class="photo-label">
+            <input class="action-select" name="_selected_action" type="checkbox" value="{{ c.pk }}">
             <a href="{{ c.pk }}/">
                 {{ c.title }}
             </a>