Merge pull request #171 from walison17/fix-pagination-links

Fix pagination links

Author: vmesel

pyjobs/core/templates/index.html

@@ -2,6 +2,7 @@
 {% load static %}
 {% load humanize %}
 {% load widget_tweaks %}
+{% load core_tags %}
 {%block title%} {{WEBSITE_NAME}} - A Central de Jobs {{WEBSITE_WORKING_LANGUAGE}}
 {%endblock%}
 {%block main%}
@@ -132,7 +133,7 @@ <h6 class="text-muted card-subtitle mb-2">Postada: {{job.created_at|naturalday}}
                     <ul class="pagination">
                       {% for page in pages %}
                         <li class="page-item">
-                            <a class="page-link" href="{% url 'index' %}?page={{page}}{% if 'search' in request.GET %}&search={{ request.GET.search }}{% endif %}">{{ page }}</a>
+                            <a class="page-link" href="{% url 'index' %}?{% merge_query_params page=page %}">{{ page }}</a>
                         </li>
                       {% endfor %}
                     </ul>

pyjobs/core/templatetags/__init__.py

@@ -0,0 +1,13 @@
+from django import template
+
+register = template.Library()
+
+
+@register.simple_tag(takes_context=True)
+def merge_query_params(context, **kwargs):
+    query_params = context["request"].GET.copy()
+
+    for k, v in kwargs.items():
+        query_params[k] = v
+
+    return query_params.urlencode()

pyjobs/core/templatetags/core_tags.py

@@ -0,0 +1,37 @@
+from django.test import SimpleTestCase, RequestFactory
+from django.template import Context, Template
+
+
+class TestMergeQueryParamsTag(SimpleTestCase):
+    def setUp(self):
+        self.rf = RequestFactory()
+
+    def test_add_param(self):
+        request = self.rf.get("/", {"description": "descricao", "salary_range": 1})
+        context = Context({"request": request})
+        template = Template(
+            "{% load core_tags %}"
+            '<a class="page-link" href="/?{% merge_query_params page=1 %}">1</a>'
+        )
+        rendered_template = template.render(context)
+
+        self.assertInHTML(
+            '<a class="page-link" href="/?description=descricao&salary_range=1&page=1">1</a>',
+            rendered_template,
+        )
+
+    def test_replace_param(self):
+        request = self.rf.get(
+            "/", {"description": "descricao", "salary_range": 1, "page": 2}
+        )
+        context = Context({"request": request})
+        template = Template(
+            "{% load core_tags %}"
+            '<a class="page-link" href="/?{% merge_query_params page=10 %}">1</a>'
+        )
+        rendered_template = template.render(context)
+
+        self.assertInHTML(
+            '<a class="page-link" href="/?description=descricao&salary_range=1&page=10">1</a>',
+            rendered_template,
+        )