X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/a66152cd03df94d103944255b836ed6ebed6ed15..b148ca4096bd2154e3c9b2d9f1cda7ef31c346db:/models/base.py

diff --git a/models/base.py b/models/base.py
index 81e557f..7a872ca 100644
--- a/models/base.py
+++ b/models/base.py
@@ -53,6 +53,7 @@ class Attribute(models.Model):
 	
 	class Meta:
 		app_label = 'philo'
+		unique_together = ('key', 'entity_content_type', 'entity_object_id')
 
 
 value_content_type_limiter = ContentTypeRegistryLimiter()
@@ -81,6 +82,7 @@ class Relationship(models.Model):
 	
 	class Meta:
 		app_label = 'philo'
+		unique_together = ('key', 'entity_content_type', 'entity_object_id')
 
 
 class QuerySetMapper(object, DictMixin):
@@ -273,7 +275,7 @@ class TreeModel(models.Model):
 		abstract = True
 
 
-class TreeEntity(TreeModel, Entity):
+class TreeEntity(Entity, TreeModel):
 	@property
 	def attributes(self):
 		if self.parent: