X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/32e27db91137094ff6b8ebb4154cb44addb837e2..0c613164e94ea79fce559b2b1632691986a84f25:/apps/catalogue/fields.py

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index e11d611e5..048824498 100644
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -114,19 +114,6 @@ class JQueryAutoCompleteField(forms.CharField):
 
         super(JQueryAutoCompleteField, self).__init__(*args, **kwargs)
 
-try:
-    # check for south
-    from south.modelsinspector import add_introspection_rules
-
-    add_introspection_rules([
-    (
-        [JSONField], # Class(es) these apply to
-        [], # Positional arguments (not used)
-        {}, # Keyword argument
-    ), ], ["^catalogue\.fields\.JSONField"])
-except ImportError:
-    pass
-
 
 class OverwritingFieldFile(FieldFile):
     """
@@ -135,11 +122,23 @@ class OverwritingFieldFile(FieldFile):
 
     def save(self, name, content, *args, **kwargs):
         leave = kwargs.pop('leave', None)
-        if not leave and self and content is not self:
+        # delete if there's a file already and there's a new one coming
+        if not leave and self and (not hasattr(content, 'path') or
+                                   content.path != self.path):
             self.delete(save=False)
-        return super(OverwritingFieldFile, self).save(name, content, *args, **kwargs)
+        return super(OverwritingFieldFile, self).save(
+                name, content, *args, **kwargs)
 
 
 class OverwritingFileField(models.FileField):
     attr_class = OverwritingFieldFile
 
+
+try:
+    # check for south
+    from south.modelsinspector import add_introspection_rules
+
+    add_introspection_rules([], ["^catalogue\.fields\.JSONField"])
+    add_introspection_rules([], ["^catalogue\.fields\.OverwritingFileField"])
+except ImportError:
+    pass