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

diff --git a/models/base.py b/models/base.py
index 37ab247..c7b1c26 100644
--- a/models/base.py
+++ b/models/base.py
@@ -358,6 +358,8 @@ class TreeManager(models.Manager):
 				
 				if deepest_level == depth:
 					# This should happen if nothing is found with any part of the given path.
+					if root is not None and deepest_found is None:
+						return root, build_path(segments)
 					raise
 				
 				return find_obj(segments, depth, deepest_found)
@@ -402,10 +404,18 @@ class TreeModel(MPTTModel):
 	slug = models.SlugField(max_length=255)
 	
 	def get_path(self, root=None, pathsep='/', field='slug'):
+		if root == self:
+			return ''
+		
 		if root is not None and not self.is_descendant_of(root):
 			raise AncestorDoesNotExist(root)
 		
-		return pathsep.join([getattr(parent, field, '?') for parent in list(self.get_ancestors()) + [self]])
+		qs = self.get_ancestors()
+		
+		if root is not None:
+			qs = qs.filter(**{'%s__gt' % self._mptt_meta.level_attr: root.get_level()})
+		
+		return pathsep.join([getattr(parent, field, '?') for parent in list(qs) + [self]])
 	path = property(get_path)
 	
 	def __unicode__(self):