git.ithinksw.org
/
philo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added 1.2.X compatibility to shipherd LazyNavigationRecurser.
[philo.git]
/
contrib
/
shipherd
/
templatetags
/
shipherd.py
diff --git
a/contrib/shipherd/templatetags/shipherd.py
b/contrib/shipherd/templatetags/shipherd.py
index
1413bdf
..
6e36126
100644
(file)
--- a/
contrib/shipherd/templatetags/shipherd.py
+++ b/
contrib/shipherd/templatetags/shipherd.py
@@
-1,4
+1,4
@@
-from django import template
+from django import template
, VERSION as django_version
from django.conf import settings
from django.utils.safestring import mark_safe
from philo.contrib.shipherd.models import Navigation
from django.conf import settings
from django.utils.safestring import mark_safe
from philo.contrib.shipherd.models import Navigation
@@
-60,6
+60,10
@@
class LazyNavigationRecurser(object):
context['item'] = item
context['children'] = self.__class__(self.template_nodes, item.get_children(), context, request)
context['item'] = item
context['children'] = self.__class__(self.template_nodes, item.get_children(), context, request)
+ # Django 1.2.X compatibility - a lazy recurser will not be called if accessed as a template variable.
+ if django_version < (1,3):
+ context['children'] = context['children']()
+
# Then render the nodelist bit by bit.
for node in self.template_nodes:
bits.append(node.render(context))
# Then render the nodelist bit by bit.
for node in self.template_nodes:
bits.append(node.render(context))