X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/9ccb8068a1e46fca83c7cc948cb66f17f5d570d2..3b1d871f1c800bac4d1a9ce85ee2eb5c5c19a4f0:/models/base.py?ds=sidebyside

diff --git a/models/base.py b/models/base.py
index 700b1e7..6f23191 100644
--- a/models/base.py
+++ b/models/base.py
@@ -20,7 +20,7 @@ class Tag(models.Model):
 
 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
@@ -159,13 +159,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):