Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #1033 -- pagination in object_list generic views now use 1-inde…

…xed page numbers in the URL. Thanks, Tom Tobin.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit da310cff674aa3d91f7e54772faf828a46071812 1 parent 47f040d
@jacobian jacobian authored
Showing with 8 additions and 8 deletions.
  1. +8 −8 django/views/generic/list_detail.py
View
16 django/views/generic/list_detail.py
@@ -39,22 +39,22 @@ def object_list(request, app_label, module_name, paginate_by=None, allow_empty=F
lookup_kwargs = extra_lookup_kwargs.copy()
if paginate_by:
paginator = ObjectPaginator(mod, lookup_kwargs, paginate_by)
- page = request.GET.get('page', 0)
+ page = request.GET.get('page', 1)
try:
- object_list = paginator.get_page(page)
- except InvalidPage:
- if page == 0 and allow_empty:
+ page = int(page)
+ object_list = paginator.get_page(page - 1)
+ except (InvalidPage, ValueError):
+ if page == 1 and allow_empty:
object_list = []
else:
raise Http404
- page = int(page)
c = DjangoContext(request, {
'object_list': object_list,
'is_paginated': paginator.pages > 1,
'results_per_page': paginate_by,
- 'has_next': paginator.has_next_page(page),
- 'has_previous': paginator.has_previous_page(page),
- 'page': page + 1,
+ 'has_next': paginator.has_next_page(page - 1),
+ 'has_previous': paginator.has_previous_page(page - 1),
+ 'page': page,
'next': page + 1,
'previous': page - 1,
'pages': paginator.pages,
Please sign in to comment.
Something went wrong with that request. Please try again.