X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/089e42600c995f8b8b23c69ba93419167c0ae5be..02b46ac5bb9ae5301e4764b9c111c971aa86b333:/apps/catalogue/fields.py

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index 11c730c71..57ce58189 100644
--- 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
+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
@@ -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 south.modelsinspector import add_introspection_rules
 
 
 class JSONEncoder(json.JSONEncoder):
@@ -53,7 +54,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):
@@ -70,24 +71,14 @@ class JSONField(models.TextField):
             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):
-        self.source = source
-        self.options = None
-        if options:
-            self.options = dumps(options)
+    def __init__(self, options, *args, **kwargs):
+        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_js(self, field_id, options):
+        return u'$(\'#%s\').autocomplete(%s).result(autocomplete_result_handler);' % (field_id, options)
 
     def render(self, name, value=None, attrs=None):
         final_attrs = self.build_attrs(attrs, name=name)
@@ -101,29 +92,71 @@ class JQueryAutoCompleteWidget(forms.TextInput):
             <script type="text/javascript">//<!--
             %(js)s//--></script>
             ''' % {
-                'attrs' : flatatt(final_attrs),
-                'js' : self.render_js(final_attrs['id']),
+                'attrs': flatatt(final_attrs),
+                'js' : self.render_js(final_attrs['id'], self.options),
             }
 
         return mark_safe(html)
 
 
+class JQueryAutoCompleteSearchWidget(JQueryAutoCompleteWidget):
+    def __init__(self, *args, **kwargs):
+        super(JQueryAutoCompleteSearchWidget, self).__init__(*args, **kwargs)
+
+    def render_js(self, field_id, options):
+        return u"""
+        $('#%s')
+        .autocomplete($.extend({
+          minLength: 0,
+          select: autocomplete_result_handler,
+          focus: function (ui, item) { return false; }
+        }, %s))
+        .data("autocomplete")._renderItem = autocomplete_format_item;
+        """ % (field_id, options)
+
+
 class JQueryAutoCompleteField(forms.CharField):
-    def __init__(self, source, options=None, *args, **kwargs):
+    def __init__(self, source, options={}, *args, **kwargs):
         if 'widget' not in kwargs:
-            kwargs['widget'] = JQueryAutoCompleteWidget(source, options)
+            options['source'] = source
+            kwargs['widget'] = JQueryAutoCompleteWidget(options)
 
         super(JQueryAutoCompleteField, self).__init__(*args, **kwargs)
 
+
+class JQueryAutoCompleteSearchField(forms.CharField):
+    def __init__(self, source, options={}, *args, **kwargs):
+        if 'widget' not in kwargs:
+            options['source'] = source
+            kwargs['widget'] = JQueryAutoCompleteSearchWidget(options)
+
+        super(JQueryAutoCompleteSearchField, 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([
-    (
-        [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