fnp
/
django-pagination.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Context is updated, return it. Also avoid recursion error."
[django-pagination.git]
/
linaro_django_pagination
/
templatetags
/
pagination_tags.py
diff --git
a/linaro_django_pagination/templatetags/pagination_tags.py
b/linaro_django_pagination/templatetags/pagination_tags.py
index
1577452
..
a4e4fed
100644
(file)
--- a/
linaro_django_pagination/templatetags/pagination_tags.py
+++ b/
linaro_django_pagination/templatetags/pagination_tags.py
@@
-186,7
+186,7
@@
class PaginateNode(Node):
new_context = paginate(context)
if self.template:
template_list.insert(0, self.template)
new_context = paginate(context)
if self.template:
template_list.insert(0, self.template)
- return loader.render_to_string(template_list, new_context,
+ return loader.render_to_string(template_list, new_context,
context_instance = context)
context_instance = context)
@@
-326,11
+326,12
@@
def paginate(context, window=DEFAULT_WINDOW, margin=DEFAULT_MARGIN):
new_context['getvars'] = "&%s" % getvars.urlencode()
else:
new_context['getvars'] = ''
new_context['getvars'] = "&%s" % getvars.urlencode()
else:
new_context['getvars'] = ''
+ except (KeyError, AttributeError):
+ new_context = {}
-
context.update(new_context)
+ context.update(new_context)
- except (KeyError, AttributeError):
- pass
+ return context
register = Library()
register = Library()