fnp
/
django-pagination.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always pass the context through
[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
b447625
..
15363d8
100644
(file)
--- a/
linaro_django_pagination/templatetags/pagination_tags.py
+++ b/
linaro_django_pagination/templatetags/pagination_tags.py
@@
-135,7
+135,7
@@
class AutoPaginateNode(Node):
self.multiple_paginations = multiple_paginations
def render(self, context):
self.multiple_paginations = multiple_paginations
def render(self, context):
- if self.multiple_paginations or
"paginator" in context
:
+ if self.multiple_paginations or
getattr(context, "paginator", None)
:
page_suffix = '_%s' % self.queryset_var
else:
page_suffix = ''
page_suffix = '_%s' % self.queryset_var
else:
page_suffix = ''
@@
-328,7
+328,11
@@
def paginate(context, window=DEFAULT_WINDOW, margin=DEFAULT_MARGIN):
to_return['getvars'] = ''
return to_return
except (KeyError, AttributeError):
to_return['getvars'] = ''
return to_return
except (KeyError, AttributeError):
- return {}
+ to_return = {}
+
+ context.update(to_return)
+
+ return context
register = Library()
register = Library()