Fix #224 -- delete_orphans independent from blank (#225)

Author: vchrisb

stdimage/models.py

@@ -284,7 +284,7 @@ def validate(self, value, model_instance):
             MinSizeValidator(self.min_size[0], self.min_size[1])(value)
 
     def save_form_data(self, instance, data):
-        if self.delete_orphans and self.blank and (data is False or data is not None):
+        if self.delete_orphans and (data is False or data is not None):
             file = getattr(instance, self.name)
             if file and file._committed and file != data:
                 file.delete(save=False)

tests/admin.py

@@ -3,6 +3,7 @@
 from . import models
 
 admin.site.register(models.AdminDeleteModel)
+admin.site.register(models.AdminUpdateModel)
 admin.site.register(models.ResizeCropModel)
 admin.site.register(models.ResizeModel)
 admin.site.register(models.SimpleModel)

tests/models.py

@@ -30,6 +30,18 @@ class AdminDeleteModel(models.Model):
     )
 
 
+class AdminUpdateModel(models.Model):
+    """can be updated through admin, image not optional"""
+    image = StdImageField(
+        upload_to=upload_to,
+        variations={
+            'thumbnail': (100, 75),
+        },
+        blank=False,
+        delete_orphans=True,
+    )
+
+
 class ResizeModel(models.Model):
     """resizes image to maximum size to fit a 640x480 area"""
     image = StdImageField(

tests/test_models.py

@@ -9,8 +9,8 @@
 from PIL import Image
 
 from . import models
-from .models import (AdminDeleteModel, CustomRenderVariationsModel, ResizeCropModel,
-                     ResizeModel, SimpleModel, ThumbnailModel,
+from .models import (AdminDeleteModel, AdminUpdateModel, CustomRenderVariationsModel,
+                     ResizeCropModel, ResizeModel, SimpleModel, ThumbnailModel,
                      ThumbnailWithoutDirectoryModel, UtilVariationsModel,)
 
 IMG_DIR = os.path.join(settings.MEDIA_ROOT, 'img')
@@ -198,13 +198,28 @@ def test_pre_save_delete_callback_clear(self, admin_client):
         assert not os.path.exists(path)
 
     def test_pre_save_delete_callback_new(self, admin_client):
-        AdminDeleteModel.objects.create(
+        obj = AdminDeleteModel.objects.create(
             image=self.fixtures['100.gif']
         )
+        path = obj.image.path
+        assert os.path.exists(path)
         admin_client.post('/admin/tests/admindeletemodel/1/change/', {
             'image': self.fixtures['600x400.jpg'],
         })
-        assert not os.path.exists(os.path.join(IMG_DIR, 'image.gif'))
+        assert not os.path.exists(path)
+        assert os.path.exists(os.path.join(IMG_DIR, '600x400.jpg'))
+
+    def test_pre_save_delete_callback_update(self, admin_client):
+        obj = AdminUpdateModel.objects.create(
+            image=self.fixtures['100.gif']
+        )
+        path = obj.image.path
+        assert os.path.exists(path)
+        admin_client.post('/admin/tests/adminupdatemodel/1/change/', {
+            'image': self.fixtures['600x400.jpg'],
+        })
+        assert not os.path.exists(path)
+        assert os.path.exists(os.path.join(IMG_DIR, '600x400.jpg'))
 
     def test_render_variations_callback(self, db):
         obj = UtilVariationsModel.objects.create(image=self.fixtures['100.gif'])