@@ -133,6 +133,11 @@ def paginate(context, window=DEFAULT_WINDOW): paginator = context['paginator'] page_obj = context['page_obj'] page_range = paginator.page_range + # Calculate the record range in the current page for display. + records = {'first': 1 + (page_obj.number - 1) * paginator.per_page} + records['last'] = records['first'] + paginator.per_page - 1 + if records['last'] + paginator.orphans >= paginator.count: + records['last'] = paginator.count # First and last are simply the first *n* pages and the last *n* pages, # where *n* is the current window size. first = set(page_range[:window]) @@ -201,6 +206,7 @@ def paginate(context, window=DEFAULT_WINDOW): to_return = { 'MEDIA_URL': settings.MEDIA_URL, 'pages': pages, + 'records': records, 'page_obj': page_obj, 'paginator': paginator, 'is_paginated': paginator.count > paginator.per_page, pagination/templatetags/pagination_tags.py @@ -4,8 +4,22 @@ >>> from django.template import Template, Context >>> p = Paginator(range(15), 2) ->>> paginate({'paginator': p, 'page_obj': p.page(1)})['pages'] +>>> pg = paginate({'paginator': p, 'page_obj': p.page(1)}) +>>> pg['pages'] +[1, 2, 3, 4, 5, 6, 7, 8] +>>> pg['records']['first'] +1 +>>> pg['records']['last'] +2 + +>>> p = Paginator(range(15), 2) +>>> pg = paginate({'paginator': p, 'page_obj': p.page(8)}) +>>> pg['pages'] [1, 2, 3, 4, 5, 6, 7, 8] +>>> pg['records']['first'] +15 +>>> pg['records']['last'] +15 >>> p = Paginator(range(17), 2) >>> paginate({'paginator': p, 'page_obj': p.page(1)})['pages'] @@ -25,8 +39,22 @@ [1, 2] >>> p = Paginator(range(21), 2, 1) ->>> paginate({'paginator': p, 'page_obj': p.page(1)})['pages'] +>>> pg = paginate({'paginator': p, 'page_obj': p.page(1)}) +>>> pg['pages'] [1, 2, 3, 4, None, 7, 8, 9, 10] +>>> pg['records']['first'] +1 +>>> pg['records']['last'] +2 + +>>> p = Paginator(range(21), 2, 1) +>>> pg = paginate({'paginator': p, 'page_obj': p.page(10)}) +>>> pg['pages'] +[1, 2, 3, 4, 5, 6, 7, 8, 9, 10] +>>> pg['records']['first'] +19 +>>> pg['records']['last'] +21 >>> t = Template("{% load pagination_tags %}{% autopaginate var 2 %}{% paginate %}") @@ -127,4 +155,4 @@ True >>> request = WSGIRequest({'REQUEST_METHOD': 'POST', 'CONTENT_TYPE': 'multipart', 'wsgi.input': StringIO()}) >>> middleware.process_request(request) >>> request.upload_handlers.append('asdf') -""" \ No newline at end of file +""" pagination/tests.py 9e414cdd4ecdd1eaebd9fce9582adb163705f674 Daniel Mizyrycki mzdaniel@gmail.com http://github.com/ericflo/django-pagination/commit/f6c6ae2af328d6cabbd46120d77671c9abf20e3b f6c6ae2af328d6cabbd46120d77671c9abf20e3b 2009-10-16T12:58:23-07:00 2009-09-12T12:58:42-07:00 Add records variable in templatetags, allowing to extend the pagination template with the record range displayed in the page. a2772429abcb0175b7df80cb9bc589ec94bfa8ee Eric Florenzano floguy@gmail.com