Merge pull request #23 from mktums/master

Implementing optional omitting of `?page=1`

diff --git a/doc/usage.rst b/doc/usage.rst
index a57cf46..199e6a3 100644 (file)
--- a/doc/usage.rst
+++ b/doc/usage.rst
@@ -168,3 +168,7 @@ behavior of the pagination tags.  Here's an overview:
 ``PAGINATION_DISPLAY_DISABLED_NEXT_LINK``
     If set to ``False``, the next page link will not be displayed if there's no 
     next page. Defaults to False.
+
+``PAGINATION_DISABLE_LINK_FOR_FIRST_PAGE``
+    if set to ``False``, the first page will have ``?page=1`` link suffix in pagination displayed, otherwise is omitted.
+    Defaults to True.

diff --git a/linaro_django_pagination/settings.py b/linaro_django_pagination/settings.py
index ff74fd3..24a04e0 100644 (file)
--- a/linaro_django_pagination/settings.py
+++ b/linaro_django_pagination/settings.py
@@ -52,3 +52,5 @@ DISPLAY_DISABLED_PREVIOUS_LINK = getattr(
     settings, 'PAGINATION_DISPLAY_DISABLED_PREVIOUS_LINK', False)
 DISPLAY_DISABLED_NEXT_LINK = getattr(
     settings, 'PAGINATION_DISPLAY_DISABLED_NEXT_LINK', False)
+DISABLE_LINK_FOR_FIRST_PAGE = getattr(
+    settings, 'PAGINATION_DISABLE_LINK_FOR_FIRST_PAGE', True)

diff --git a/linaro_django_pagination/templates/pagination/pagination.html b/linaro_django_pagination/templates/pagination/pagination.html
index 1bd9ab5..95b85ca 100644 (file)
--- a/linaro_django_pagination/templates/pagination/pagination.html
+++ b/linaro_django_pagination/templates/pagination/pagination.html
@@ -3,7 +3,11 @@
 <div class="pagination">
   {% block previouslink %}
   {% if page_obj.has_previous %}
+  {% if disable_link_for_first_page and page_obj.previous_page_number == 1 %}
+  <a href="{{ request.path }}{{ getvars }}" class="prev">{{ previous_link_decorator|safe }}{% trans "previous" %}</a>
+  {% else %}
   <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 %}
   <span class="disabled prev">{{ previous_link_decorator|safe }}{% trans "previous" %}</span>
@@ -17,7 +21,11 @@
   {% ifequal page page_obj.number %}
   <span class="current page">{{ page }}</span>
   {% else %}
+  {% if disable_link_for_first_page and page == 1 %}
+  <a href="{{ request.path }}{{ getvars }}" class="page">{{ page }}</a>
+  {% else %}
   <a href="?page{{ page_suffix }}={{ page }}{{ getvars }}" class="page">{{ page }}</a>
+  {% endif %}
   {% endifequal %}
   {% else %}
   ...

diff --git a/linaro_django_pagination/templatetags/pagination_tags.py b/linaro_django_pagination/templatetags/pagination_tags.py
index a703928..995edc3 100644 (file)
--- a/linaro_django_pagination/templatetags/pagination_tags.py
+++ b/linaro_django_pagination/templatetags/pagination_tags.py
@@ -306,6 +306,7 @@ def paginate(context, window=DEFAULT_WINDOW, margin=DEFAULT_MARGIN):
         new_context = {
             'MEDIA_URL': settings.MEDIA_URL,
             'STATIC_URL': getattr(settings, "STATIC_URL", None),
+            'disable_link_for_first_page': DISABLE_LINK_FOR_FIRST_PAGE,
             'display_disabled_next_link': DISPLAY_DISABLED_NEXT_LINK,
             'display_disabled_previous_link': DISPLAY_DISABLED_PREVIOUS_LINK,
             'display_page_links': DISPLAY_PAGE_LINKS,