Author: mtredinnick
Date: 2008-07-08 00:29:23 -0500 (Tue, 08 Jul 2008)
New Revision: 7869
Modified:
django/trunk/django/contrib/admin/views/main.py
django/trunk/django/views/generic/list_detail.py
Log:
Fixed #7670 -- Fixed a couple of missed changes from [7865]. Patch from
jshaffer.
Modified: django/trunk/django/contrib/admin/views/main.py
===================================================================
--- django/trunk/django/contrib/admin/views/main.py 2008-07-08 05:28:37 UTC
(rev 7868)
+++ django/trunk/django/contrib/admin/views/main.py 2008-07-08 05:29:23 UTC
(rev 7869)
@@ -611,7 +611,7 @@
return mark_safe('?' + '&'.join([u'%s=%s' % (k, v) for k, v in
p.items()]).replace(' ', '%20'))
def get_results(self, request):
- paginator = QuerySetPaginator(self.query_set,
self.lookup_opts.admin.list_per_page)
+ paginator = Paginator(self.query_set,
self.lookup_opts.admin.list_per_page)
# Get the number of objects, with admin filters applied.
try:
Modified: django/trunk/django/views/generic/list_detail.py
===================================================================
--- django/trunk/django/views/generic/list_detail.py 2008-07-08 05:28:37 UTC
(rev 7868)
+++ django/trunk/django/views/generic/list_detail.py 2008-07-08 05:29:23 UTC
(rev 7869)
@@ -45,7 +45,7 @@
if extra_context is None: extra_context = {}
queryset = queryset._clone()
if paginate_by:
- paginator = QuerySetPaginator(queryset, paginate_by,
allow_empty_first_page=allow_empty)
+ paginator = Paginator(queryset, paginate_by,
allow_empty_first_page=allow_empty)
if not page:
page = request.GET.get('page', 1)
try:
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
