X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/afddfc678f3ec8bbb39ae6a7d4ccbc4d2007416f..71209be8f9c399340bddb819f71e99ecf116187b:/apps/catalogue/fields.py

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index 4de2e7cb6..390fb0359 100644
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -3,18 +3,12 @@
 # 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.db.models.fields.files import FieldFile
-from django.db.models import signals
 from django import forms
-from django.forms.widgets import flatatt
-from django.utils.encoding 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 _
 
 
@@ -72,74 +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).result(autocomplete_result_handler);' % (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)
-
-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:
+        # 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(*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