Some search tests and fixes.

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

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index a75752e..2c0c765 100644 (file)
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -1,16 +1,20 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 import datetime
 
 from django.conf import settings
 from django.db import models
 from django.db.models import signals
 import datetime
 
 from django.conf import settings
 from django.db import models
 from django.db.models import signals

-from django.dispatch import dispatcher

 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 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 _
+from south.modelsinspector import add_introspection_rules

 
 
 class JSONEncoder(json.JSONEncoder):
 
 
 class JSONEncoder(json.JSONEncoder):


@@ -32,36 +36,41 @@ def loads(str):
     return json.loads(str, encoding=settings.DEFAULT_CHARSET)
 
 
     return json.loads(str, encoding=settings.DEFAULT_CHARSET)
 
 

+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)
+
+

 class JSONField(models.TextField):
 class JSONField(models.TextField):

+    def formfield(self, **kwargs):
+        defaults = {'form_class': JSONFormField}
+        defaults.update(kwargs)
+        return super(JSONField, self).formfield(**defaults)
+

     def db_type(self):
         return 'text'
     def db_type(self):
         return 'text'

-    
+

     def get_internal_type(self):
         return 'TextField'
 
     def get_internal_type(self):
         return 'TextField'
 

-    def pre_save(self, model_instance, add):
-        value = getattr(model_instance, self.attname, None)
-        return dumps(value)
-

     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)

-        signals.post_init.connect(self.post_init, sender=cls)
-
-        def get_json(model_instance):
-            return dumps(getattr(model_instance, self.attname, None))
-        setattr(cls, 'get_%s_json' % self.name, get_json)
+        
+        def get_value(model_instance):
+            return loads(getattr(model_instance, self.attname, None))
+        setattr(cls, 'get_%s_value' % self.name, get_value)

 
 

-        def set_json(model_instance, json):
-            return setattr(model_instance, self.attname, loads(json))
-        setattr(cls, 'set_%s_json' % self.name, set_json)
+        def set_value(model_instance, json):
+            return setattr(model_instance, self.attname, dumps(json))
+        setattr(cls, 'set_%s_value' % self.name, set_value)

 
 

-    def post_init(self, **kwargs):
-        instance = kwargs.get('instance', None)
-        value = self.value_from_object(instance)
-        if (value):
-            setattr(instance, self.attname, loads(value))
-        else:
-            setattr(instance, self.attname, None)
+add_introspection_rules([], ["^catalogue\.fields\.JSONField"])

 
 
 class JQueryAutoCompleteWidget(forms.TextInput):
 
 
 class JQueryAutoCompleteWidget(forms.TextInput):


@@ -78,7 +87,7 @@ class JQueryAutoCompleteWidget(forms.TextInput):
         if self.options:
             options += ', %s' % self.options
         
         if self.options:
             options += ', %s' % self.options
         

-        return u'$(\'#%s\').autocomplete(%s%s);' % (field_id, source, 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)
     
     def render(self, name, value=None, attrs=None):
         final_attrs = self.build_attrs(attrs, name=name)