fnp
/
django-pagination.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow explicit page suffix.
[django-pagination.git]
/
fnp_django_pagination
/
templatetags
/
pagination_tags.py
diff --git
a/fnp_django_pagination/templatetags/pagination_tags.py
b/fnp_django_pagination/templatetags/pagination_tags.py
index
7f38da5
..
3d6a973
100644
(file)
--- a/
fnp_django_pagination/templatetags/pagination_tags.py
+++ b/
fnp_django_pagination/templatetags/pagination_tags.py
@@
-42,10
+42,8
@@
from django.template import (
loader,
)
loader,
)
-try:
- from django.template.base import TOKEN_BLOCK
-except ImportError: # Django < 1.8
- from django.template import TOKEN_BLOCK
+from django.template.base import TokenType
+TOKEN_BLOCK = TokenType.BLOCK
from django.template.loader import select_template
from django.utils.text import unescape_string_literal
from django.template.loader import select_template
from django.utils.text import unescape_string_literal
@@
-144,7
+142,9
@@
class AutoPaginateNode(Node):
if self.multiple_paginations and 'multiple_paginations' not in context:
context['multiple_paginations'] = True
if self.multiple_paginations and 'multiple_paginations' not in context:
context['multiple_paginations'] = True
- if context.get('multiple_paginations') or getattr(context, "paginator", None):
+ if context.get('page_suffix'):
+ page_suffix = context['page_suffix']
+ elif context.get('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 = ''