X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/8de917b335927dacfa0815a016ee17b638969ab9..de93f8f95b089c292500c0f4c2bd1adf06e305cf:/apps/catalogue/fields.py?ds=sidebyside

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index 654dbfb21..e2d94b915 100644
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -9,10 +9,11 @@ from django.db import models
 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 _
 
 
 class JSONEncoder(json.JSONEncoder):
@@ -36,7 +37,7 @@ def loads(str):
 
 class JSONFormField(forms.CharField):
     widget = forms.Textarea
-    
+
     def clean(self, value):
         try:
             loads(value)
@@ -51,7 +52,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 +60,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)
@@ -76,23 +77,23 @@ class JQueryAutoCompleteWidget(forms.TextInput):
         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>
@@ -100,7 +101,7 @@ class JQueryAutoCompleteWidget(forms.TextInput):
                 'attrs' : flatatt(final_attrs),
                 'js' : self.render_js(final_attrs['id']),
             }
-        
+
         return mark_safe(html)
 
 
@@ -108,6 +109,18 @@ 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