From: Joseph Spiros Date: Wed, 19 May 2010 09:41:32 +0000 (-0400) Subject: Fixing a bug whereby get_path on TreeModel and Node subclasses failed if the field... X-Git-Tag: philo-0.9~85 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/3951a6f1b971ace912697f7229b71a55589b28b9?hp=83c66d95a1af4eea014a85668521be6b153ea07f Fixing a bug whereby get_path on TreeModel and Node subclasses failed if the field specified does not exist on an ancestor. --- 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)