summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2005-11-28 14:26:04 +0000
committerAdrian Holovaty <adrian@holovaty.com>2005-11-28 14:26:04 +0000
commit496e777da974e6496a9e0f896825e314f72d59b6 (patch)
treee64e2b94f5b55a7d4d8c927c3110622125429124
parent133839b0337177816fc40c9a9abd4151f51b6030 (diff)
Fixed #947 -- Corrected is_paginated variable in list_detail generic view. Thanks, nesh
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1478 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/views/generic/list_detail.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/views/generic/list_detail.py b/django/views/generic/list_detail.py
index f4cdf90c56..18500b26de 100644
--- a/django/views/generic/list_detail.py
+++ b/django/views/generic/list_detail.py
@@ -7,7 +7,7 @@ from django.core.paginator import ObjectPaginator, InvalidPage
from django.core.exceptions import Http404, ObjectDoesNotExist
def object_list(request, app_label, module_name, paginate_by=None, allow_empty=False,
- template_name=None, template_loader=template_loader,
+ template_name=None, template_loader=template_loader,
extra_lookup_kwargs={}, extra_context={}):
"""
Generic list of objects.
@@ -50,7 +50,7 @@ def object_list(request, app_label, module_name, paginate_by=None, allow_empty=F
page = int(page)
c = Context(request, {
'object_list': object_list,
- 'is_paginated': True,
+ 'is_paginated': paginator.pages > 1,
'results_per_page': paginate_by,
'has_next': paginator.has_next_page(page),
'has_previous': paginator.has_previous_page(page),
@@ -80,7 +80,7 @@ def object_list(request, app_label, module_name, paginate_by=None, allow_empty=F
def object_detail(request, app_label, module_name, object_id=None, slug=None,
slug_field=None, template_name=None, template_name_field=None,
- template_loader=template_loader, extra_lookup_kwargs={},
+ template_loader=template_loader, extra_lookup_kwargs={},
extra_context={}):
"""
Generic list of objects.