git.ithinksw.org
/
philo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Corrections to has_navigation and navigation_host to use the new NavigationMapper...
[philo.git]
/
philo
/
models
/
base.py
diff --git
a/philo/models/base.py
b/philo/models/base.py
index
d1dc38a
..
2138381
100644
(file)
--- a/
philo/models/base.py
+++ b/
philo/models/base.py
@@
-515,7
+515,7
@@
class TreeEntity(Entity, MPTTModel):
"""
if mapper is None:
"""
if mapper is None:
- if
self.parent
:
+ if
getattr(self, "%s_id" % self._mptt_meta.parent_attr)
:
mapper = TreeAttributeMapper
else:
mapper = AttributeMapper
mapper = TreeAttributeMapper
else:
mapper = AttributeMapper
@@
-542,7
+542,7
@@
class SlugTreeEntity(TreeEntity):
path = property(get_path)
def clean(self):
path = property(get_path)
def clean(self):
- if
self.parent
is None:
+ if
getattr(self, "%s_id" % self._mptt_meta.parent_attr)
is None:
try:
self._default_manager.exclude(pk=self.pk).get(slug=self.slug, parent__isnull=True)
except self.DoesNotExist:
try:
self._default_manager.exclude(pk=self.pk).get(slug=self.slug, parent__isnull=True)
except self.DoesNotExist: