FIXBUG: криво работал пагинатор

abonapp/templatetags/dpagination.py

@@ -0,0 +1,10 @@
+from django import template
+
+register = template.Library()
+
+
+@register.simple_tag
+def url_page_replace(request, field, value):
+    dict_ = request.GET.copy()
+    dict_[field] = value
+    return dict_.urlencode()

templates/toolbar_page.html

@@ -1,29 +1,24 @@
-{% with request.GET.urlencode|yesno:'&,' as start_divide %}
-{% with request.GET.urlencode as url %}
-{% if pag.paginator.num_pages > 1 %}
-    <div class="row">
-        <div class="col-sm-4 col-sm-offset-4">
-            <ul class="pagination">
-                {% if pag.number == 1 %}
-                    <li class="disabled"><a href="#">&laquo;</a></li>
-                {% else %}
-                    <li><a href="?{{ url }}{{ start_divide }}p=1">&laquo;</a></li>
-                {% endif %}
-                {% if pag.has_previous %}
-                    <li><a href="?{{ url }}{{ start_divide }}p={{ pag.previous_page_number }}">{{ pag.previous_page_number }}</a></li>
-                {% endif %}
-                <li class="disabled"><a href="#">{{ pag.number }}</a></li>
-                {% if pag.has_next %}
-                    <li><a href="?{{ url }}{{ start_divide }}p={{ pag.next_page_number }}">{{ pag.next_page_number }}</a></li>
-                {% endif %}
-                {% if pag.number == pag.paginator.num_pages %}
-                    <li class="disabled"><a href="#">&raquo;</a></li>
-                {% else %}
-                    <li><a href="?{{ url }}{{ start_divide }}p={{ pag.paginator.num_pages }}">&raquo;</a></li>
-                {% endif %}
-            </ul>
-        </div>
+{% load dpagination %}
+<div class="row">
+    <div class="col-sm-4 col-sm-offset-4">
+        <ul class="pagination">
+            {% if pag.number == 1 %}
+                <li class="disabled"><a href="#">&laquo;</a></li>
+            {% else %}
+                <li><a href="?{% url_page_replace request 'p' 1 %}">&laquo;</a></li>
+            {% endif %}
+            {% if pag.has_previous %}
+                <li><a href="?{% url_page_replace request 'p' pag.previous_page_number %}">{{ pag.previous_page_number }}</a></li>
+            {% endif %}
+            <li class="disabled"><a href="#">{{ pag.number }}</a></li>
+            {% if pag.has_next %}
+                <li><a href="?{% url_page_replace request 'p' pag.next_page_number %}">{{ pag.next_page_number }}</a></li>
+            {% endif %}
+            {% if pag.number == pag.paginator.num_pages %}
+                <li class="disabled"><a href="#">&raquo;</a></li>
+            {% else %}
+                <li><a href="?{% url_page_replace request 'p' pag.paginator.num_pages %}">&raquo;</a></li>
+            {% endif %}
+        </ul>
     </div>
-{% endif %}
-{% endwith %}
-{% endwith %}
+</div>