fix pagination override issue

defrex · Aug 14, 2014 · 767dc97 · 767dc97
1 parent c9a603a
commit 767dc97
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/bootstrap_paginator/templatetags/paginator.py b/bootstrap_paginator/templatetags/paginator.py
@@ -62,7 +62,7 @@ def urlencode_plus(values, **plus):
     new_values.update(values)
     new_values.update(plus)
 
-    for key, value in values.items():
+    for key, value in new_values.items():
         if isinstance(value, text_type):
             new_values[key] = value.encode('utf8')
         else:

diff --git a/tests/testlist/tests.py b/tests/testlist/tests.py
@@ -4,6 +4,7 @@
 from django.test import TestCase, Client
 
 from testlist.models import TestModel
+from bootstrap_paginator.templatetags.paginator import urlencode_plus
 
 
 class BootstrapPaginatorTestCase(TestCase):
@@ -19,3 +20,8 @@ def test_paginator(self):
     def test_unicode_get(self):
         response = Client().get('/?city=Montréal')
         self.assertEqual(response.status_code, 200)
+
+    def test_urlencode_plus(self):
+        self.assertTrue(
+            'page=3' in urlencode_plus({'page': '2'}, page='3')
+        )