fix

[django-pagination.git] / fnp_django_pagination / templatetags / pagination_tags.py

diff --git a/fnp_django_pagination/templatetags/pagination_tags.py b/fnp_django_pagination/templatetags/pagination_tags.py
index 0845501..ca51e40 100644 (file)
--- a/fnp_django_pagination/templatetags/pagination_tags.py
+++ b/fnp_django_pagination/templatetags/pagination_tags.py
@@ -187,14 +187,15 @@ class AutoPaginateNode(Node):
 
 class PaginateNode(Node):
 
-    def __init__(self, template=None, window=None, margin=None):
+    def __init__(self, template=None, window=None, margin=None, ignored_vars=None):
         self.template = template
         self.window = window
         self.margin = margin
+        self.ignored_vars = ignored_vars
 
     def render(self, context):
         template_list = ['pagination/pagination.html']
-        new_context = paginate(context, window=self.window, margin=self.margin)
+        new_context = paginate(context, window=self.window, margin=self.margin, ignored_vars=self.ignored_vars)
         if self.template:
             template_list.insert(0, self.template)
         return loader.render_to_string(template_list, new_context)
@@ -214,8 +215,9 @@ def do_paginate(parser, token):
     argv = token.split_contents()
     argc = len(argv)
     template = None
-    window=DEFAULT_WINDOW
-    margin=DEFAULT_MARGIN
+    window = DEFAULT_WINDOW
+    margin = DEFAULT_MARGIN
+    ignored_vars = []
     i = 1
     while i < argc:
         if argv[i] == 'using':
@@ -227,14 +229,17 @@ def do_paginate(parser, token):
         elif argv[i] == 'margin':
             margin = argv[i + 1]
             i += 2
+        elif argv[i] == 'ignore':
+            ignored_vars.append(argv[i + 1])
+            i += 2
         else:
             raise TemplateSyntaxError(
                 "Invalid syntax. Proper usage of this tag is: "
                 "{% paginate [using \"TEMPLATE\"] %}")
-    return PaginateNode(template, window, margin)
+    return PaginateNode(template, window, margin, ignored_vars)
 
 
-def paginate(context, window=DEFAULT_WINDOW, margin=DEFAULT_MARGIN):
+def paginate(context, window=DEFAULT_WINDOW, margin=DEFAULT_MARGIN, ignored_vars=None):
     """
     Renders the ``pagination/pagination.html`` template, resulting in a
     Digg-like display of the available pages, given the current page.  If there
@@ -349,6 +354,10 @@ def paginate(context, window=DEFAULT_WINDOW, margin=DEFAULT_MARGIN):
         }
         if 'request' in context:
             getvars = context['request'].GET.copy()
+            if ignored_vars:
+                for v in ignored_vars:
+                    if v in getvars:
+                        del getvars[v]
             if 'page%s' % page_suffix in getvars:
                 del getvars['page%s' % page_suffix]
             if len(getvars.keys()) > 0: