Commit 409ed946 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixed #7670 -- Fixed a couple of missed changes from [7865]. Patch from jshaffer. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent a616b921

django/contrib/admin/views/main.py

+1 −1
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ class ChangeList(object): 
        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:

django/views/generic/list_detail.py

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ def object_list(request, queryset, paginate_by=None, page=None, 
    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: