bogus file field type migration

[wolnelektury.git] / apps / catalogue / fields.py

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index 11c730c..510c06d 100644 (file)
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -3,9 +3,11 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 import datetime
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 import datetime

+from functools import wraps

 
 from django.conf import settings
 from django.db import models
 
 from django.conf import settings
 from django.db import models

+from django.db.models.fields.files import FieldFile

 from django.db.models import signals
 from django import forms
 from django.forms.widgets import flatatt
 from django.db.models import signals
 from django import forms
 from django.forms.widgets import flatatt


@@ -14,7 +16,6 @@ from django.utils import simplejson as json
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _

-from south.modelsinspector import add_introspection_rules

 
 
 class JSONEncoder(json.JSONEncoder):
 
 
 class JSONEncoder(json.JSONEncoder):


@@ -53,7 +54,7 @@ class JSONField(models.TextField):
         defaults.update(kwargs)
         return super(JSONField, self).formfield(**defaults)
 
         defaults.update(kwargs)
         return super(JSONField, self).formfield(**defaults)
 

-    def db_type(self):
+    def db_type(self, connection):

         return 'text'
 
     def get_internal_type(self):
         return 'text'
 
     def get_internal_type(self):


@@ -70,8 +71,6 @@ class JSONField(models.TextField):
             return setattr(model_instance, self.attname, dumps(json))
         setattr(cls, 'set_%s_value' % self.name, set_value)
 
             return setattr(model_instance, self.attname, dumps(json))
         setattr(cls, 'set_%s_value' % self.name, set_value)
 

-add_introspection_rules([], ["^catalogue\.fields\.JSONField"])
-

 
 class JQueryAutoCompleteWidget(forms.TextInput):
     def __init__(self, source, options=None, *args, **kwargs):
 
 class JQueryAutoCompleteWidget(forms.TextInput):
     def __init__(self, source, options=None, *args, **kwargs):


@@ -115,15 +114,28 @@ class JQueryAutoCompleteField(forms.CharField):
 
         super(JQueryAutoCompleteField, self).__init__(*args, **kwargs)
 
 
         super(JQueryAutoCompleteField, self).__init__(*args, **kwargs)
 

+
+class OverwritingFieldFile(FieldFile):
+    """
+        Deletes the old file before saving the new one.
+    """
+
+    def save(self, name, content, *args, **kwargs):
+        leave = kwargs.pop('leave', None)
+        if not leave and self and content is not self:
+            self.delete(save=False)
+        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
 
 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"])
+    add_introspection_rules([], ["^catalogue\.fields\.JSONField"])
+    add_introspection_rules([], ["^catalogue\.fields\.OverwritingFileField"])

 except ImportError:
     pass
 except ImportError:
     pass