X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/118eb9b3276b91fe7f54f904abad893ed2f0c496..36f395364e4467720c550c829d1bfec2e9da5d5f:/models.py?ds=sidebyside diff --git a/models.py b/models.py index 4df28d3..b66c4c3 100644 --- a/models.py +++ b/models.py @@ -220,10 +220,10 @@ class InheritableTreeEntity(TreeEntity): return None def get_path(self, pathsep='/', field='slug'): - path = getattr(self.instance, field, '?') + path = getattr(self.instance, field, getattr(self.instance, 'slug', '?')) parent = self.parent while parent: - path = getattr(parent.instance, field, '?') + pathsep + path + path = getattr(parent.instance, field, getattr(parent.instance, 'slug', '?')) + pathsep + path parent = parent.parent return path path = property(get_path) @@ -283,9 +283,6 @@ class Redirect(Node): response = HttpResponseRedirect(self.target) response.status_code = self.status_code return response - - def __unicode__(self): - return self.slug class File(Node): @@ -298,9 +295,6 @@ class File(Node): response = HttpResponse(wrapper, content_type=self.mimetype) response['Content-Length'] = self.file.size return response - - def __unicode__(self): - return self.file class Template(TreeModel):