X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/631688575ca2c0a4bdfdf99bdd2470ee9630bc25..ba508f5b30489abd8baa8535350542d7e2ebc68c:/models/fields.py

diff --git a/models/fields.py b/models/fields.py
index 3e43c0f..19a6006 100644
--- 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