X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/2f90757a89424650440d684e08cbf53d98cec8fd..15c62e5321c25c46ab53154609546fdb05cc5fbe:/models/base.py

diff --git a/models/base.py b/models/base.py
index ae15d16..2338d72 100644
--- a/models/base.py
+++ b/models/base.py
@@ -368,24 +368,47 @@ class TreeModel(models.Model):
 	parent = models.ForeignKey('self', related_name='children', null=True, blank=True)
 	slug = models.SlugField(max_length=255)
 	
-	def has_ancestor(self, ancestor):
-		parent = self
+	def has_ancestor(self, ancestor, inclusive=False):
+		if inclusive:
+			parent = self
+		else:
+			parent = self.parent
+		
+		parents = []
+		
 		while parent:
 			if parent == ancestor:
 				return True
+			# If we've found this parent before, the path is recursive and ancestor wasn't on it.
+			if parent in parents:
+				return False
+			parents.append(parent)
 			parent = parent.parent
+		# If ancestor is None, catch it here.
+		if parent == ancestor:
+			return True
 		return False
 	
 	def get_path(self, root=None, pathsep='/', field='slug'):
-		if root is not None and not self.has_ancestor(root):
-			raise AncestorDoesNotExist(root)
-		
-		path = getattr(self, field, '?')
 		parent = self.parent
+		parents = [self]
+		
+		def compile_path(parents):
+			return pathsep.join([getattr(parent, field, '?') for parent in parents])
+		
 		while parent and parent != root:
-			path = getattr(parent, field, '?') + pathsep + path
+			if parent in parents:
+				if root is not None:
+					raise AncestorDoesNotExist(root)
+				parents.append(parent)
+				return u"\u2026%s%s" % (pathsep, compile_path(parents[::-1]))
+			parents.append(parent)
 			parent = parent.parent
-		return path
+		
+		if root is not None and parent is None:
+			raise AncestorDoesNotExist(root)
+		
+		return compile_path(parents[::-1])
 	path = property(get_path)
 	
 	def __unicode__(self):