X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/f578580e09ad5ef0466d48983c7480fcaccb42b4..16c91c1902f065c6d9b12a5c89c04d6aef620291:/models/fields.py

diff --git a/models/fields.py b/models/fields.py
index cff8ff8..83798c4 100644
--- a/models/fields.py
+++ b/models/fields.py
@@ -14,12 +14,13 @@ __all__ = ('JSONAttribute', 'ForeignKeyAttribute', 'ManyToManyAttribute')
 class EntityProxyField(object):
 	descriptor_class = None
 	
-	def __init__(self, verbose_name=None, help_text=None, default=NOT_PROVIDED, *args, **kwargs):
+	def __init__(self, verbose_name=None, help_text=None, default=NOT_PROVIDED, editable=True, *args, **kwargs):
 		if self.descriptor_class is None:
 			raise NotImplementedError('EntityProxyField subclasses must specify a descriptor_class.')
 		self.verbose_name = verbose_name
 		self.help_text = help_text
 		self.default = default
+		self.editable = editable
 	
 	def actually_contribute_to_class(self, sender, **kwargs):
 		sender._entity_meta.add_proxy_field(self)
@@ -61,7 +62,7 @@ class AttributeFieldDescriptor(object):
 			except KeyError:
 				return None
 		else:
-			raise AttributeError('The \'%s\' attribute can only be accessed from %s instances.' % (self.field.name, owner.__name__))
+			return None
 	
 	def __set__(self, instance, value):
 		raise NotImplementedError('AttributeFieldDescriptor subclasses must implement a __set__ method.')
@@ -91,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
@@ -199,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:
@@ -230,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
@@ -240,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