fnp
/
django-pagination.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix window exceeding page range
[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
d6e121e
..
f106942
100644
(file)
--- a/
linaro_django_pagination/templatetags/pagination_tags.py
+++ b/
linaro_django_pagination/templatetags/pagination_tags.py
@@
-174,7
+174,7
@@
class AutoPaginateNode(Node):
'False, an HTTP 404 page would have been shown instead.')
context[key] = []
context['invalid_page'] = True
'False, an HTTP 404 page would have been shown instead.')
context[key] = []
context['invalid_page'] = True
- return
u
''
+ return ''
if self.context_var is not None:
context[self.context_var] = page_obj.object_list
else:
if self.context_var is not None:
context[self.context_var] = page_obj.object_list
else:
@@
-182,7
+182,7
@@
class AutoPaginateNode(Node):
context['paginator'] = paginator
context['page_obj'] = page_obj
context['page_suffix'] = page_suffix
context['paginator'] = paginator
context['page_obj'] = page_obj
context['page_suffix'] = page_suffix
- return
u
''
+ return ''
class PaginateNode(Node):
class PaginateNode(Node):
@@
-284,7
+284,7
@@
def paginate(context, window=DEFAULT_WINDOW, margin=DEFAULT_MARGIN):
window_end = window_end - window_start
window_start = 0
if window_end > paginator.num_pages:
window_end = window_end - window_start
window_start = 0
if window_end > paginator.num_pages:
- window_start =
window_start - (window_end - paginator.num_pages
)
+ window_start =
max(0, window_start - (window_end - paginator.num_pages)
)
window_end = paginator.num_pages
pages = page_range[window_start:window_end]
window_end = paginator.num_pages
pages = page_range[window_start:window_end]