git.ithinksw.org
/
philo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c679970
)
Generalized the 'single step' case in TreeEntity.get_path to include the case where...
author
Stephen Burrows
<stephen.r.burrows@gmail.com>
Fri, 24 Jun 2011 17:09:33 +0000
(13:09 -0400)
committer
Stephen Burrows
<stephen.r.burrows@gmail.com>
Fri, 24 Jun 2011 17:09:33 +0000
(13:09 -0400)
philo/models/base.py
patch
|
blob
|
history
diff --git
a/philo/models/base.py
b/philo/models/base.py
index
2138381
..
8df67c3
100644
(file)
--- a/
philo/models/base.py
+++ b/
philo/models/base.py
@@
-471,14
+471,15
@@
class TreeEntity(Entity, MPTTModel):
if root == self:
return ''
if root == self:
return ''
- if root is None and self.is_root_node():
+ parent_id = getattr(self, "%s_id" % self._mptt_meta.parent_attr)
+ if getattr(root, 'pk', None) == parent_id:
return getattr(self, field, '?')
if root is not None and not self.is_descendant_of(root):
raise AncestorDoesNotExist(root)
if memoize:
return getattr(self, field, '?')
if root is not None and not self.is_descendant_of(root):
raise AncestorDoesNotExist(root)
if memoize:
- memo_args = (
getattr(self, "%s_id" % self._mptt_meta.parent_attr)
, getattr(root, 'pk', None), pathsep, getattr(self, field, '?'))
+ memo_args = (
parent_id
, getattr(root, 'pk', None), pathsep, getattr(self, field, '?'))
try:
return self._path_memo[memo_args]
except AttributeError:
try:
return self._path_memo[memo_args]
except AttributeError: