From: Michele Ciccozzi Date: Mon, 6 Jun 2011 13:06:45 +0000 (+0200) Subject: Merge branch 'more_customizations' X-Git-Tag: release-2.0~32^2 X-Git-Url: https://git.mdrn.pl/django-pagination.git/commitdiff_plain/b10406063c839f4ad856a1130c66706f004fa358?hp=1bf7cd1497bc0eca075bfa512831b941bfc83d25 Merge branch 'more_customizations' Conflicts: pagination/templates/pagination/pagination.html pagination/templatetags/pagination_tags.py --- diff --git a/pagination/middleware.py b/pagination/middleware.py index f8a2a6f..676f909 100644 --- a/pagination/middleware.py +++ b/pagination/middleware.py @@ -1,10 +1,10 @@ -def get_page(self): +def get_page(self, suffix): """ A function which will be monkeypatched onto the request to get the current integer representing the current page. """ try: - return int(self.REQUEST['page']) + return int(self.REQUEST['page%s' % suffix]) except (KeyError, ValueError, TypeError): return 1 @@ -14,4 +14,4 @@ class PaginationMiddleware(object): it exists in either **GET** or **POST** portions of the request. """ def process_request(self, request): - request.__class__.page = property(get_page) \ No newline at end of file + request.__class__.page = get_page \ No newline at end of file diff --git a/pagination/templates/pagination/default.html b/pagination/templates/pagination/default.html index 794765b..2fe8410 100644 --- a/pagination/templates/pagination/default.html +++ b/pagination/templates/pagination/default.html @@ -3,12 +3,12 @@ -{% endif %} \ No newline at end of file +{% endif %} diff --git a/pagination/templatetags/pagination_tags.py b/pagination/templatetags/pagination_tags.py index fe4bd07..2ad1403 100755 --- a/pagination/templatetags/pagination_tags.py +++ b/pagination/templatetags/pagination_tags.py @@ -4,6 +4,7 @@ except NameError: from sets import Set as set from django import template +from django.template import TOKEN_BLOCK from django.http import Http404 from django.core.paginator import Paginator, InvalidPage from django.conf import settings @@ -18,13 +19,19 @@ INVALID_PAGE_RAISES_404 = getattr(settings, DISPLAY_PAGE_LINKS = getattr(settings, 'PAGINATION_DISPLAY_PAGE_LINKS', True) PREVIOUS_LINK_DECORATOR = getattr(settings, 'PAGINATION_PREVIOUS_LINK_DECORATOR', "‹‹ ") NEXT_LINK_DECORATOR = getattr(settings, 'PAGINATION_NEXT_LINK_DECORATOR', " ››") -DISPLAY_DISABLED_PREVIOUS_LINK = getattr(settings, 'PAGINATION_DISPLAY_DISABLED_PREVIOUS_LINK', True) -DISPLAY_DISABLED_NEXT_LINK = getattr(settings, 'PAGINATION_DISPLAY_DISABLED_NEXT_LINK', True) +DISPLAY_DISABLED_PREVIOUS_LINK = getattr(settings, 'PAGINATION_DISPLAY_DISABLED_PREVIOUS_LINK', False) +DISPLAY_DISABLED_NEXT_LINK = getattr(settings, 'PAGINATION_DISPLAY_DISABLED_NEXT_LINK', False) def do_autopaginate(parser, token): """ Splits the arguments to the autopaginate tag and formats them correctly. """ + + # Check whether there are any other autopaginations are later in this template + expr = lambda obj: (obj.token_type == TOKEN_BLOCK and \ + len(obj.split_contents()) > 0 and obj.split_contents()[0] == "autopaginate") + multiple_paginations = len(filter(expr, parser.tokens)) > 0 + split = token.split_contents() as_index = None context_var = None @@ -41,10 +48,10 @@ def do_autopaginate(parser, token): "context_var_name %%}" % split[0]) del split[as_index:as_index + 2] if len(split) == 2: - return AutoPaginateNode(split[1]) + return AutoPaginateNode(split[1], multiple_paginations=multiple_paginations) elif len(split) == 3: return AutoPaginateNode(split[1], paginate_by=split[2], - context_var=context_var) + context_var=context_var, multiple_paginations=multiple_paginations) elif len(split) == 4: try: orphans = int(split[3]) @@ -52,7 +59,7 @@ def do_autopaginate(parser, token): raise template.TemplateSyntaxError(u'Got %s, but expected integer.' % split[3]) return AutoPaginateNode(split[1], paginate_by=split[2], orphans=orphans, - context_var=context_var) + context_var=context_var, multiple_paginations=multiple_paginations) else: raise template.TemplateSyntaxError('%r tag takes one required ' + 'argument and one optional argument' % split[0]) @@ -74,7 +81,7 @@ class AutoPaginateNode(template.Node): tag. If you choose not to use *{% paginate %}*, make sure to display the list of available pages, or else the application may seem to be buggy. """ - def __init__(self, queryset_var, paginate_by=DEFAULT_PAGINATION, + def __init__(self, queryset_var, multiple_paginations, paginate_by=DEFAULT_PAGINATION, orphans=DEFAULT_ORPHANS, context_var=None): self.queryset_var = template.Variable(queryset_var) if isinstance(paginate_by, int): @@ -83,8 +90,14 @@ class AutoPaginateNode(template.Node): self.paginate_by = template.Variable(paginate_by) self.orphans = orphans self.context_var = context_var + self.multiple_paginations = multiple_paginations def render(self, context): + if self.multiple_paginations or context.has_key('paginator'): + page_suffix = '_%s' % self.queryset_var + else: + page_suffix = '' + key = self.queryset_var.var value = self.queryset_var.resolve(context) if isinstance(self.paginate_by, int): @@ -93,7 +106,7 @@ class AutoPaginateNode(template.Node): paginate_by = self.paginate_by.resolve(context) paginator = Paginator(value, paginate_by, self.orphans) try: - page_obj = paginator.page(context['request'].page) + page_obj = paginator.page(context['request'].page(page_suffix)) except InvalidPage: if INVALID_PAGE_RAISES_404: raise Http404('Invalid page requested. If DEBUG were set to ' + @@ -107,6 +120,7 @@ class AutoPaginateNode(template.Node): context[key] = page_obj.object_list context['paginator'] = paginator context['page_obj'] = page_obj + context['page_suffix'] = page_suffix return u'' @@ -143,6 +157,7 @@ def paginate(context, window=DEFAULT_WINDOW, hashtag=''): try: paginator = context['paginator'] page_obj = context['page_obj'] + page_suffix = context.get('page_suffix', '') page_range = paginator.page_range pagination_template = context.get('pagination_template', 'pagination/default.html') # Calculate the record range in the current page for display. @@ -223,6 +238,7 @@ def paginate(context, window=DEFAULT_WINDOW, hashtag=''): 'paginator': paginator, 'hashtag': hashtag, 'is_paginated': paginator.count > paginator.per_page, + 'page_suffix': page_suffix, 'display_page_links': DISPLAY_PAGE_LINKS, 'display_disabled_previous_link': DISPLAY_DISABLED_PREVIOUS_LINK, 'display_disabled_next_link': DISPLAY_DISABLED_NEXT_LINK, @@ -232,8 +248,8 @@ def paginate(context, window=DEFAULT_WINDOW, hashtag=''): } if 'request' in context: getvars = context['request'].GET.copy() - if 'page' in getvars: - del getvars['page'] + if 'page%s' % page_suffix in getvars: + del getvars['page%s' % page_suffix] if len(getvars.keys()) > 0: to_return['getvars'] = "&%s" % getvars.urlencode() else: diff --git a/pagination/tests.py b/pagination/tests.py index 31b3301..f1cad49 100644 --- a/pagination/tests.py +++ b/pagination/tests.py @@ -56,11 +56,15 @@ >>> pg['records']['last'] 21 +>>> p = Paginator(range(21), 2, 1) +>>> paginate({'paginator': p, 'page_obj': p.page(1)})['pages'] +[1, 2, 3, 4, None, 7, 8, 9, 10] + >>> t = Template("{% load pagination_tags %}{% autopaginate var 2 %}{% paginate %}") >>> from django.http import HttpRequest as DjangoHttpRequest >>> class HttpRequest(DjangoHttpRequest): -... page = 1 +... page = lambda self, suffix: 1 >>> t.render(Context({'var': range(21), 'request': HttpRequest()})) u'\\n\\n