X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/3b366a97268ee50421047f5e147aef8a8c4fc984..16c91c1902f065c6d9b12a5c89c04d6aef620291:/models/fields.py?ds=inline

diff --git a/models/fields.py b/models/fields.py
index 85c5583..83798c4 100644
--- a/models/fields.py
+++ b/models/fields.py
@@ -92,7 +92,7 @@ class ForeignKeyAttributeDescriptor(AttributeFieldDescriptor):
 
 class ManyToManyAttributeDescriptor(AttributeFieldDescriptor):
 	def __set__(self, instance, value):
-		if isinstance(value, models.QuerySet):
+		if isinstance(value, models.query.QuerySet):
 			if self.field in instance._removed_attribute_registry:
 				instance._removed_attribute_registry.remove(self.field)
 			instance._added_attribute_registry[self.field] = value
@@ -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