Added fix_init_kwarg method to JSONField and connected it to the pre_init signal...

[philo.git] / models / fields.py

diff --git a/models/fields.py b/models/fields.py
index 3e43c0f..83798c4 100644 (file)
--- a/models/fields.py
+++ b/models/fields.py
@@ -200,7 +200,11 @@ class TemplateField(models.TextField):
 
 
 class JSONFormField(forms.Field):
+       default_validators = [json_validator]
+       
        def clean(self, value):
+               if value == '' and not self.required:
+                       return None
                try:
                        return json.loads(value)
                except Exception, e:
@@ -231,9 +235,7 @@ class JSONDescriptor(object):
 
 
 class JSONField(models.TextField):
-       def __init__(self, *args, **kwargs):
-               super(JSONField, self).__init__(*args, **kwargs)
-               self.validators.append(json_validator)
+       default_validators = [json_validator]
        
        def get_attname(self):
                return "%s_json" % self.name
@@ -241,6 +243,11 @@ class JSONField(models.TextField):
        def contribute_to_class(self, cls, name):
                super(JSONField, self).contribute_to_class(cls, name)
                setattr(cls, name, JSONDescriptor(self))
+               models.signals.pre_init.connect(self.fix_init_kwarg, sender=cls)
+       
+       def fix_init_kwarg(self, sender, args, kwargs, **signal_kwargs):
+               if self.name in kwargs:
+                       kwargs[self.attname] = json.dumps(kwargs.pop(self.name))
        
        def formfield(self, *args, **kwargs):
                kwargs["form_class"] = JSONFormField