From d78e766edf2ebb0d7821ea8ee5ddeda39b69c023 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Fri, 6 May 2011 14:23:43 +0200
Subject: [PATCH] fix search criteria for paginator

---
 telemeta/htdocs/images/user_red.png           | Bin 1352 -> 1306 bytes
 .../telemeta_default/inc/collection_list.html |   1 +
 .../templates/telemeta_default/paginator.html |   7 ++++---
 telemeta/templatetags/paginator.py            |   1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/telemeta/htdocs/images/user_red.png b/telemeta/htdocs/images/user_red.png
index 91ecf5bf2ad6edecbb6beebd6be6ef1e6d103f9b..7fafb7a75bf4690dc7aa5c0382de7a51d4eb19d3 100644
GIT binary patch
delta 1252
zcmV<A1RMLv3YrR#Mt{FaL_t(o!^M|dPgGYF$A5e8!yq$U24)5axd?)wP^=2JP+M!0
zUSh4qr>2SarRfLptJr>mHnuNKA6jFY^Z}uwR*M#dks<>lb73x=vv(in;vfuj@RF{{
zBqurRto>jAz4m{tEiPjjs+b|~qH)kbr4K~mFA;^G#I0FwoPP`&fX3z!!R~{!4GiFG
z_9K-71jcCWY?eoV-ePg)HtCHx8iVz!fE1Z97!($r$A%f1xWLH82|_(RTYNV&8LnUb
zmg`r)V{vANjl_ECdx5A5L>)t3sRl-&XbOip`_0#!{^}A<;V?pO%~n|!!R~I_2Kv#C
zLuNfe^644|jem5(Ox3N?XzKkfbiO&vp;MzY1cT2&nnK1RpK(Jlz#AWZNG6#iok*~@
zut?6%xMD_Ds}2Wf3h(F0nKN5JRQy6~`o_oU8ymwH2%xY^Kz1`(y->mD_tP;rNPSDo
z7B++s2q7@Wl-Q9<(cBhhe{U~=&JH}@x>B*f6c7z~ynkMr542J1^FBMOLTq_10xDX4
zpoPZP5H+>?T<}o^NHKtv63gR3D8*h(Dr;L&zc3>JLQ0g!Q#I%|mZW<faph@@!Le=7
zrmA20v(ft104Yj#E}bU6yi7K|v8SzZY}+*$>Bb=)kFz{GOL{%NWA;03O?o{}Di*`e
z<y`1$RevD)wv}3oF+V*`A{wn4P&*FEwHPb&^TZY-<kD$Z67PzUL^R6m?|-oJ@Sh#C
zFV_*rwpse?9*^(dB@vBc>zu1D>;i})ok_BE?;ek)r+M<=A<pLJwk;_F%cfGyO->S-
zxlJ~c!W5*v8Y}LOFJNc0-2L@8ZeF`aHkGRA8-HI};r@*qEZ)9@Kq6gLh>NCY(Aa>D
zO)L^&bzw1olq*;+wLx@lp4jSgDbu{f@6L)<-tGlrOM?;!q_7Z1V_7x$0s*{DeuS*7
zu+ma^d_L+tUbNO|#|D#+|9tF<^GFehgC>W;pb2$!a%gmv;ZHv1__=fRpMHlxX9vo%
zDu1Y}q^_}nKvx$H!62KN3>#0MlEuMbkQHi1T*flxGpWMD*W64)C`9mJ7ac=Gv=0r^
zHqc)R?y1{XQNHcXO_HmttSv@(GW&q}sVO3N?y&l3fwf44)an|Ju}k7m1SBq@N_;su
zGzD7eA0OxVXXhFG;4BTHAhljELMeolrGL{=etfsdeBn52ou6f6kC&L6oMh_9pP2di
z7ZNK^u=OSqRRUreGzNpEYUv+4&C#>(Gw|NKbPNsA+<su!1&i;>RaOWAA|GBVg;i5S
z_;4R}jSaN4x6^&%1e4$Yz}(F#Qi)i;KCrM1hFXu8P)`q|7bh6GIKlqD-l~f~-+yVV
z`TE0Q{NXU2$A<F&Yin7!HA5mA#j$g!A-K|cbda$xzu@HO7dUWaz;&yysy{pUs+t;F
zd%6j9bs?lA8C@kFi{@`vt%rIzasE@<`Va4z(aVA;AF`#&-w67~-bQQ9zxV%U;o<$f
zjx>eCbdQ{T;YHnoDo?IH5TN(1Q(gGm!Z<~V-^(QRDgc$#)Z;1K77IXjlkC@Nb}ol@
zoWgy%a7%lBrqIso2Ulc70G8T;5xK`{{bd=c0i?nrlSuwATT^62VeuboQ}7HNEPu!V
O0000<MNUMnLSTZBEMlPm

delta 1299
zcmV+u1?>8o3djnOMt|)|L_t(o!@ZYVQ&U$I$A5e8Ly!P+Nx*QGo1jpv3RbAS*qL6&
zT8mGecC;^@eh|Nk?I&o*_NCK@)^R%12Lwf}7AcpY1rh=YAs5csyALOcAcP!mU75_B
zN!DKHzy5pe|5{sI!7`LEgX^Mk&_J;TBKMVu+(+WoEH6$54S&GFx(0$BhiU5Tqq43R
zsT3eEMq_6(%-_C4c<L^x%{Ur^^{Rm6nJ^d>7H!7|85+CD(4{dNIy-mxZl%-Qxb_`4
zu6<8<YKqOodSSgllmw!VBd?YMqfpd@LY({d8_s@xnVL`tA$Ml0EQ?@A2TgswXvZPF
zo?v5b6@x~4V1K6M)@U?Uwe_^UIY`&(VXA|{ryxx(W8r389SrcsM<0^j*dUciu(}W?
zYo|RiBTH3>1Jr~LarC|Sc7Q0lLTh?PN9h?Ep)wFaVHJSvXR>smLS=0&t^NH})z|M}
zLkNKo0%J^p9jO#`O(70-cN1u9#pkam6#Gj7(SXnIr+==wiSkPS)1xZHj^{j}yj2D2
zIoQ}hS@{7Ee3Sr^4<Mz)^7#--@jND#wX3LKm=ORWCCcY38FUv*(z}j$@-)Wa*fwZW
z(r^2-(fZW@$xC)Nl_I{hL?*TQTwCMVwr4QXi$f|NXK8wx)Ovi+?DyK5)Ows`EQX!U
zdeGI9K!4n}m0XQ6H#tcn5-Ax_I}RJGF;?d0h=mu)rc$0H-V-B<NQCJ>{$yq5pFOkR
zt|N|Z^W?7wJidRQL?nW(v!1%J2Ox@6dV?nq9xy*S$?~HaoUN^0TapKsNhX;cA7^pu
zE}3)^lauyRtav-VfSt*3|F_?{b^SV-WU{Dle1Bzyhc|B$zIzXWM0%<a4^7XYu>l*K
z*y1A5g|K^+i&!?fNo018Sahk7sVnjOvtn&;_X4q_K?wv>SO}xBtTHMC0sJ+!2w7ZV
zrKRvyR#M^fqqRmmHW)Ylv$2cLBY7YWnk)u`rlGZsuHj(@Klzvw=g-r7_H6=fttiVX
zqJOTEii6bz+S{oP2H8rd*<4#AgM+~!i`0y`f@QYPqza45x;m;G8VDY4r*&X}mVthn
z`g#k&eH90a%D26>#YQyBYIu?5=|{{>Ot5(G9?|&)Ru>mZMpto+T@Z&nAaNO0;LE|G
zCeTRl=qM*XyFmX3=csN7QttO7ltM^ZIDZ}6kMAy-&mCv2-B~vF_zAP)<4pYYGgH6(
zN@8UhTW=vz1t69|V=!2%oZgYM96R?ueeb?Q>%ahYEzSGBF#q3nl@&sOaKlTbu*%8^
z9qFOsU^VqEEp(hb$@mXHGJ9)+WFqF)2NssWQ10{7(AmlGr7?ysjd7@_yX4EC?SHhT
zd}~7?YC|E~jt{y3%gb4~Gesg2!LhTb0l3<Bte=rDzu?s87im7)=egCF)So?kRaqI0
zogD<)+YwT-5s4CyMcms}V^=39FMLW<?~y$-dRY+Lhis|b8$r*=8MM~?`|xiTW*)ja
zQWFZ%F?8yMU+NXq_T;Jp0lMEhO@D1u2q!P`&ofEA3P1%l_4#tQ#T*dFw$Zl3|840+
z0z2c*E0+7i2GMYs`j%#tWuf(cSM8VP1*sItwKbMzX4qU`cPGKGz%+IB(tYMM<yBQk
zr7+sO#_e%SA)87QUs+~;@-~t1oGbA*He0WegZ*ZZvYep(2U<Z0;=op2k_-R<002ov
JPDHLkV1mTod5r)7

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)
-- 
2.39.5