From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Wed, 19 May 2010 09:46:33 +0000 (-0400)
Subject: Merge branch 'master' into penfield
X-Git-Tag: philo-0.9~67^2~16
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/0687ae812884b047c1f9ce56610e47b802cb2488?hp=ff326d8f22115f25ee8fb449447b1d77b5f5a1e0

Merge branch 'master' into penfield
---

diff --git a/models.py b/models.py
index 1d255c7..64cf769 100644
--- a/models.py
+++ b/models.py
@@ -163,10 +163,10 @@ class TreeModel(models.Model):
 	slug = models.SlugField()
 	
 	def get_path(self, pathsep='/', field='slug'):
-		path = getattr(self, field)
+		path = getattr(self, field, '?')
 		parent = self.parent
 		while parent:
-			path = getattr(parent, field) + pathsep + path
+			path = getattr(parent, field, '?') + pathsep + path
 			parent = parent.parent
 		return path
 	path = property(get_path)
@@ -199,10 +199,10 @@ class Node(TreeEntity):
 	instance_type = models.ForeignKey(ContentType, editable=False)
 	
 	def get_path(self, pathsep='/', field='slug'):
-		path = getattr(self.instance, field)
+		path = getattr(self.instance, field, '?')
 		parent = self.parent
 		while parent:
-			path = getattr(parent.instance, field) + pathsep + path
+			path = getattr(parent.instance, field, '?') + pathsep + path
 			parent = parent.parent
 		return path
 	path = property(get_path)