Suppress warning, "RemovedInDjango19Warning: `request.REQUEST` is deprecated, use...

[django-pagination.git] / linaro_django_pagination / templates / pagination / pagination.html

diff --git a/linaro_django_pagination/templates/pagination/pagination.html b/linaro_django_pagination/templates/pagination/pagination.html
index 5d926a3..ea01b61 100644 (file)
--- a/linaro_django_pagination/templates/pagination/pagination.html
+++ b/linaro_django_pagination/templates/pagination/pagination.html
@@ -3,10 +3,10 @@
 <div class="pagination">
   {% block previouslink %}
   {% if page_obj.has_previous %}
 <div class="pagination">
   {% block previouslink %}
   {% if page_obj.has_previous %}

-  {% if display_link_for_first_page and page_obj.previous_page_number == 1 %}
-  <a href="{{ getvars }}" class="prev">{{ previous_link_decorator|safe }}{% trans "previous" %}</a>
+  {% if disable_link_for_first_page and page_obj.previous_page_number == 1 %}
+  <a href="{{ request.path }}{% if getvars %}?{{ getvars|slice:"1:" }}{% endif %}" class="prev">{{ previous_link_decorator|safe }}{% trans "previous" %}</a>

   {% else %}
   {% else %}

-  <a href="{% if disable_link_for_first_page and page_obj.previous_page_number != 1 %}?page{{ page_suffix }}={{ page_obj.previous_page_number }}{% endif %}{{ getvars }}" class="prev">{{ previous_link_decorator|safe }}{% trans "previous" %}</a>
+  <a href="?page{{ page_suffix }}={{ page_obj.previous_page_number }}{{ getvars }}" class="prev">{{ previous_link_decorator|safe }}{% trans "previous" %}</a>

   {% endif %}
   {% else %}
   {% if display_disabled_previous_link %}
   {% endif %}
   {% else %}
   {% if display_disabled_previous_link %}


@@ -22,7 +22,7 @@
   <span class="current page">{{ page }}</span>
   {% else %}
   {% if disable_link_for_first_page and page == 1 %}
   <span class="current page">{{ page }}</span>
   {% else %}
   {% if disable_link_for_first_page and page == 1 %}

-  <a href="{{ getvars }}" class="page">{{ page }}</a>
+  <a href="{{ request.path }}{% if getvars %}?{{ getvars|slice:"1:" }}{% endif %}" class="page">{{ page }}</a>

   {% else %}
   <a href="?page{{ page_suffix }}={{ page }}{{ getvars }}" class="page">{{ page }}</a>
   {% endif %}
   {% else %}
   <a href="?page{{ page_suffix }}={{ page }}{{ getvars }}" class="page">{{ page }}</a>
   {% endif %}