X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/3d1fb545dd1f49e0624d3adf20e5568b1c33d8ec..0c10af94c3d8f16624d5a8ac775502f92c085cde:/apps/catalogue/fields.py?ds=sidebyside diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py index 4de2e7cb6..510c06dac 100644 --- a/apps/catalogue/fields.py +++ b/apps/catalogue/fields.py @@ -114,32 +114,28 @@ 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): """ Deletes the old file before saving the new one. """ - def save(self, *args, **kwargs): + def save(self, name, content, *args, **kwargs): leave = kwargs.pop('leave', None) - if not leave and self: + if not leave and self and content is not self: self.delete(save=False) - return super(OverwritingFieldFile, self).save(*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