X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/92aff1148db7b03f585dbe204abda452a402c20c..3c26965045e8881acd4d5de8c195e4aa61b95ed1:/models/base.py?ds=sidebyside

diff --git a/models/base.py b/models/base.py
index 5f8fb03..af1e880 100644
--- a/models/base.py
+++ b/models/base.py
@@ -5,7 +5,7 @@ from django.contrib.contenttypes import generic
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.validators import RegexValidator
 from django.utils import simplejson as json
-from django.utils.encoding import smart_str
+from django.utils.encoding import force_unicode
 from philo.exceptions import AncestorDoesNotExist
 from philo.models.fields import JSONField
 from philo.utils import ContentTypeRegistryLimiter, ContentTypeSubclassLimiter
@@ -55,10 +55,6 @@ def unregister_value_model(model):
 class AttributeValue(models.Model):
 	attribute_set = generic.GenericRelation('Attribute', content_type_field='value_content_type', object_id_field='value_object_id')
 	
-	@property
-	def attribute(self):
-		return self.attribute_set.all()[0]
-	
 	def set_value(self, value):
 		raise NotImplementedError
 	
@@ -81,10 +77,10 @@ attribute_value_limiter = ContentTypeSubclassLimiter(AttributeValue)
 
 
 class JSONValue(AttributeValue):
-	value = JSONField(verbose_name='Value (JSON)', help_text='This value must be valid JSON.', default='null')
+	value = JSONField(verbose_name='Value (JSON)', help_text='This value must be valid JSON.', default='null', db_index=True)
 	
 	def __unicode__(self):
-		return smart_str(self.value)
+		return force_unicode(self.value)
 	
 	def value_formfields(self):
 		kwargs = {'initial': self.value_json}
@@ -104,7 +100,7 @@ class JSONValue(AttributeValue):
 
 class ForeignKeyValue(AttributeValue):
 	content_type = models.ForeignKey(ContentType, limit_choices_to=value_content_type_limiter, verbose_name='Value type', null=True, blank=True)
-	object_id = models.PositiveIntegerField(verbose_name='Value ID', null=True, blank=True)
+	object_id = models.PositiveIntegerField(verbose_name='Value ID', null=True, blank=True, db_index=True)
 	value = generic.GenericForeignKey()
 	
 	def value_formfields(self):
@@ -219,11 +215,11 @@ class ManyToManyValue(AttributeValue):
 
 
 class Attribute(models.Model):
-	entity_content_type = models.ForeignKey(ContentType, related_name='attribute_entity_set', verbose_name='Entity type', db_index=True)
+	entity_content_type = models.ForeignKey(ContentType, related_name='attribute_entity_set', verbose_name='Entity type')
 	entity_object_id = models.PositiveIntegerField(verbose_name='Entity ID', db_index=True)
 	entity = generic.GenericForeignKey('entity_content_type', 'entity_object_id')
 	
-	value_content_type = models.ForeignKey(ContentType, related_name='attribute_value_set', limit_choices_to=attribute_value_limiter, verbose_name='Value type', null=True, blank=True, db_index=True)
+	value_content_type = models.ForeignKey(ContentType, related_name='attribute_value_set', limit_choices_to=attribute_value_limiter, verbose_name='Value type', null=True, blank=True)
 	value_object_id = models.PositiveIntegerField(verbose_name='Value ID', null=True, blank=True, db_index=True)
 	value = generic.GenericForeignKey('value_content_type', 'value_object_id')
 	
@@ -275,9 +271,9 @@ class EntityOptions(object):
 
 class EntityBase(models.base.ModelBase):
 	def __new__(cls, name, bases, attrs):
+		entity_meta = attrs.pop('EntityMeta', None)
 		new = super(EntityBase, cls).__new__(cls, name, bases, attrs)
-		entity_options = attrs.pop('EntityMeta', None)
-		setattr(new, '_entity_meta', EntityOptions(entity_options))
+		new.add_to_class('_entity_meta', EntityOptions(entity_meta))
 		entity_class_prepared.send(sender=new)
 		return new