X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/1f74e9a6dc7dd2303f3271ccf4c7a3eb59e3e27e..ad9d29909733d402b8c197cb7c5d46afe887fa15:/apps/catalogue/fields.py?ds=inline

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index 1c0eb4a22..390fb0359 100644
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -6,13 +6,10 @@ import datetime
 
 from django.conf import settings
 from django.db import models
-from django.db.models import signals
+from django.db.models.fields.files import FieldFile
 from django import forms
-from django.forms.widgets import flatatt
-from django.forms.util import smart_unicode
 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 _
 
 
 class JSONEncoder(json.JSONEncoder):
@@ -36,13 +33,13 @@ def loads(str):
 
 class JSONFormField(forms.CharField):
     widget = forms.Textarea
-    
+
     def clean(self, value):
         try:
             loads(value)
             return value
         except ValueError, e:
-            raise forms.ValidationError('Enter a valid JSON value. Error: %s' % e)
+            raise forms.ValidationError(_('Enter a valid JSON value. Error: %s') % e)
 
 
 class JSONField(models.TextField):
@@ -51,7 +48,7 @@ class JSONField(models.TextField):
         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):
@@ -59,7 +56,7 @@ class JSONField(models.TextField):
 
     def contribute_to_class(self, cls, name):
         super(JSONField, self).contribute_to_class(cls, name)
-        
+
         def get_value(model_instance):
             return loads(getattr(model_instance, self.attname, None))
         setattr(cls, 'get_%s_value' % self.name, get_value)
@@ -69,45 +66,30 @@ class JSONField(models.TextField):
         setattr(cls, 'set_%s_value' % self.name, set_value)
 
 
-class JQueryAutoCompleteWidget(forms.TextInput):
-    def __init__(self, source, options=None, *args, **kwargs):
-        self.source = source
-        self.options = None
-        if options:
-            self.options = dumps(options)
-        super(JQueryAutoCompleteWidget, self).__init__(*args, **kwargs)
-    
-    def render_js(self, field_id):
-        source = "'%s'" % escape(self.source)
-        options = ''
-        if self.options:
-            options += ', %s' % self.options
-        
-        return u'$(\'#%s\').autocomplete(%s%s);' % (field_id, source, options)
-    
-    def render(self, name, value=None, attrs=None):
-        final_attrs = self.build_attrs(attrs, name=name)
-        if value:
-            final_attrs['value'] = smart_unicode(value)
-        
-        if not self.attrs.has_key('id'):
-            final_attrs['id'] = 'id_%s' % name
-        
-        html = u'''<input type="text" %(attrs)s/>
-            <script type="text/javascript">//<!--
-            %(js)s//--></script>
-            ''' % {
-                'attrs' : flatatt(final_attrs),
-                'js' : self.render_js(final_attrs['id']),
-            }
-        
-        return mark_safe(html)
-
-
-class JQueryAutoCompleteField(forms.CharField):
-    def __init__(self, source, options=None, *args, **kwargs):
-        if 'widget' not in kwargs:
-            kwargs['widget'] = JQueryAutoCompleteWidget(source, options)
-        
-        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)
+        # 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)
+
+
+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