#1913: tags in section titles break toc

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

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index 2c0c765..57ce581 100644 (file)
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -3,18 +3,19 @@
 # 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

-from django.forms.util import smart_unicode
+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 _
 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):
 
 
 class JSONEncoder(json.JSONEncoder):


@@ -38,7 +39,7 @@ def loads(str):
 
 class JSONFormField(forms.CharField):
     widget = forms.Textarea
 
 class JSONFormField(forms.CharField):
     widget = forms.Textarea

-    
+

     def clean(self, value):
         try:
             loads(value)
     def clean(self, value):
         try:
             loads(value)


@@ -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):


@@ -61,7 +62,7 @@ class JSONField(models.TextField):
 
     def contribute_to_class(self, cls, name):
         super(JSONField, self).contribute_to_class(cls, name)
 
     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)
         def get_value(model_instance):
             return loads(getattr(model_instance, self.attname, None))
         setattr(cls, 'get_%s_value' % self.name, get_value)


@@ -70,48 +71,92 @@ 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):
 
 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)
         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)
         if value:
             final_attrs['value'] = smart_unicode(value)
     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
         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>
             ''' % {
         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']),
+                'attrs': flatatt(final_attrs),
+                'js' : self.render_js(final_attrs['id'], self.options),

             }
             }

-        
+

         return mark_safe(html)
 
 
         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):
 class JQueryAutoCompleteField(forms.CharField):

-    def __init__(self, source, options=None, *args, **kwargs):
+    def __init__(self, source, options={}, *args, **kwargs):

         if 'widget' not in kwargs:
         if 'widget' not in kwargs:

-            kwargs['widget'] = JQueryAutoCompleteWidget(source, options)
-        
+            options['source'] = source
+            kwargs['widget'] = JQueryAutoCompleteWidget(options)
+

         super(JQueryAutoCompleteField, self).__init__(*args, **kwargs)
 
         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([], ["^catalogue\.fields\.JSONField"])
+    add_introspection_rules([], ["^catalogue\.fields\.OverwritingFileField"])
+except ImportError:
+    pass