From: yomguy <yomguy@parisson.com>
Date: Fri, 6 May 2011 12:23:43 +0000 (+0200)
Subject: fix search criteria for paginator
X-Git-Tag: 1.1~237
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d78e766edf2ebb0d7821ea8ee5ddeda39b69c023;p=telemeta.git

fix search criteria for paginator
---

diff --git a/telemeta/htdocs/images/user_red.png b/telemeta/htdocs/images/user_red.png
index 91ecf5bf..7fafb7a7 100644
Binary files a/telemeta/htdocs/images/user_red.png and b/telemeta/htdocs/images/user_red.png differ
diff --git a/telemeta/templates/telemeta_default/inc/collection_list.html b/telemeta/templates/telemeta_default/inc/collection_list.html
index 6f8a6eb9..a21474c7 100644
--- a/telemeta/templates/telemeta_default/inc/collection_list.html
+++ b/telemeta/templates/telemeta_default/inc/collection_list.html
@@ -2,6 +2,7 @@
 {% load i18n %}
 {% if collections %}
 {% if hits %}
+
 <p class="pagination">
 {% blocktrans %}Collections {{ first_on_page }} to {{ last_on_page }} on {{ hits }}{% endblocktrans %}
 | Pages : {% if pages == 1 %}1{% else %}{% if is_paginated %}{% load paginator %}{% paginator 5 %}{% endif %}{% endif %}
diff --git a/telemeta/templates/telemeta_default/paginator.html b/telemeta/templates/telemeta_default/paginator.html
index 415d5fa2..e47187d6 100644
--- a/telemeta/templates/telemeta_default/paginator.html
+++ b/telemeta/templates/telemeta_default/paginator.html
@@ -1,7 +1,8 @@
+{% load telemeta_utils %}
 {% load i18n %}
 
 {% if has_previous %}
-    <a href="?page={{ previous }}">&lt; {% trans "Previous" %}</a>
+    <a href="?page={{ previous }}&amp;{{ criteria|build_query_string }}">&lt; {% trans "Previous" %}</a>
 {% endif %}
 
 {% if show_first %}
@@ -11,7 +12,7 @@
     {% ifequal linkpage page %}
         {{ page }}
     {% else %}
-        <a href="?page={{ linkpage }}">{{ linkpage }}</a>
+        <a href="?page={{ linkpage }}&amp;{{ criteria|build_query_string }}">{{ linkpage }}</a>
     {% endifequal %}
 {% endfor %}
 {% if show_last %}
@@ -19,5 +20,5 @@
     <a href="?page=last">{{ pages }}</a>
 {% endif %}
 {% if has_next %}
-    <a href="?page={{ next }}">{% trans "Next" %} &gt;</a>
+    <a href="?page={{ next }}&amp;{{ criteria|build_query_string }}">{% trans "Next" %} &gt;</a>
 {% endif %}
diff --git a/telemeta/templatetags/paginator.py b/telemeta/templatetags/paginator.py
index 65d1b96e..1db6e8c6 100644
--- a/telemeta/templatetags/paginator.py
+++ b/telemeta/templatetags/paginator.py
@@ -37,6 +37,7 @@ def paginator(context, adjacent_pages=2):
         'has_previous': context['has_previous'],
         'show_first': 1 not in page_numbers,
         'show_last': context['pages'] not in page_numbers,
+        'criteria' : context['criteria'], 
     }
 
 register.inclusion_tag('telemeta/paginator.html', takes_context=True)(paginator)