X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/bae6b1cbc5eb00d2273c45b55ea0950949fce0a9..92691d27d00f2c9a1b0536020ca2a5c1ec07f3e3:/models/base.py?ds=sidebyside

diff --git a/models/base.py b/models/base.py
index 3482a1a..87914be 100644
--- a/models/base.py
+++ b/models/base.py
@@ -9,15 +9,18 @@ from UserDict import DictMixin
 
 class Tag(models.Model):
 	name = models.CharField(max_length=250)
-	slug = models.SlugField()
+	slug = models.SlugField(unique=True)
 	
 	def __unicode__(self):
 		return self.name
+	
+	class Meta:
+		app_label = 'philo'
 
 
 class Titled(models.Model):
 	title = models.CharField(max_length=255)
-	slug = models.SlugField()
+	slug = models.SlugField(max_length=255)
 	
 	def __unicode__(self):
 		return self.title
@@ -49,6 +52,7 @@ class Attribute(models.Model):
 	
 	class Meta:
 		app_label = 'philo'
+		unique_together = ('key', 'entity_content_type', 'entity_object_id')
 
 
 value_content_type_limiter = ContentTypeRegistryLimiter()
@@ -77,6 +81,7 @@ class Relationship(models.Model):
 	
 	class Meta:
 		app_label = 'philo'
+		unique_together = ('key', 'entity_content_type', 'entity_object_id')
 
 
 class QuerySetMapper(object, DictMixin):
@@ -113,7 +118,6 @@ class Entity(models.Model):
 	
 	class Meta:
 		abstract = True
-		app_label = 'philo'
 
 
 class TreeManager(models.Manager):
@@ -157,13 +161,29 @@ class TreeModel(models.Model):
 	parent = models.ForeignKey('self', related_name='children', null=True, blank=True)
 	slug = models.SlugField()
 	
-	def get_path(self, pathsep='/', field='slug'):
-		path = getattr(self, field, '?')
-		parent = self.parent
+	def has_ancestor(self, ancestor):
+		parent = self
 		while parent:
-			path = getattr(parent, field, '?') + pathsep + path
+			if parent == ancestor:
+				return True
 			parent = parent.parent
-		return path
+		return False
+	
+	def get_path(self, root=None, pathsep='/', field='slug'):
+		if root is not None and self.has_ancestor(root):
+			path = ''
+			parent = self
+			while parent and parent != root:
+				path = getattr(parent, field, '?') + pathsep + path
+				parent = parent.parent
+			return path
+		else:
+			path = getattr(self, field, '?')
+			parent = self.parent
+			while parent and parent != root:
+				path = getattr(parent, field, '?') + pathsep + path
+				parent = parent.parent
+			return path
 	path = property(get_path)
 	
 	def __unicode__(self):
@@ -172,7 +192,6 @@ class TreeModel(models.Model):
 	class Meta:
 		unique_together = (('parent', 'slug'),)
 		abstract = True
-		app_label = 'philo'
 
 
 class TreeEntity(TreeModel, Entity):
@@ -189,5 +208,4 @@ class TreeEntity(TreeModel, Entity):
 		return super(TreeEntity, self).relationships
 	
 	class Meta:
-		abstract = True
-		app_label = 'philo'
\ No newline at end of file
+		abstract = True
\ No newline at end of file