From 1445b2334410484bd6000aea7c79e72206eb6754 Mon Sep 17 00:00:00 2001 From: yomguy Date: Fri, 6 May 2011 14:33:58 +0200 Subject: [PATCH] fix no criteria for search results --- telemeta/htdocs/images/search_red.png | Bin 1103 -> 1346 bytes telemeta/templatetags/paginator.py | 8 ++++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/telemeta/htdocs/images/search_red.png b/telemeta/htdocs/images/search_red.png index d9545e0a34df10f67a144048611a596f6241a953..54ab50c3dda790fc9e571b086fc006f13a16de02 100644 GIT binary patch delta 1294 zcmV+p1@ZdN2*L`GF%Je}OGiWi000000Qp0^e~~U1e*gz`Nliru+XV&;9R^0TrmX+~ z1j0!~K~z}7?Uqe!T-6zdpZDB5GycJhU2KyOS4mYM1d58vPZdETXhT)C8#iKsFqC+a zc7a);NL5(1s997+ERs@%4IqKAs%$Exrd4Q~ivLt9jfyQoVo^ksIQG!mo+S3n+>!3Je?MdJs(n}Y==<(H&;8E%-gDr8UAkEC2c^yh zt<|zG4B)%PqKfu6B<&V#6p#XzEReu}4CFQup3d#ZUv4yJmIIJ9{c*7_E2Z{!CXXMN=jTZ!fPn^V_(}+Wn27Q0vX|gHg~A(c(#8(SDd?{I@8`$Q zJ$J#E_YM#9_UNb$nzLPv@ril}Kl^j7mbYAiZxsq#gY;M@P>{6g5|abmHaN)C#Dpf_ ze|^^}sA2clV?6Ya7^f~5Ae?`QFjN3i$yfIEU2^jC+WzdbboTbDxVSGi8QrmitkGzSe{*OE14W5~bmJXqT51^}g{}Y=aOZ;$ zHYM%bxszA+>|vo=<&`~q*tc_MQ~b`Me<4@`NZ@)y$8suwK$5s-{raY)*Peg=qT|); z*MG8`Gbm=ZS_U|4<3$cm9zEKWbl1ZVUvzxx=uyraQ)Zv2L9Jzg1vt`JB7gOT7n+jp z+qH`=BO|nRb+Kh+g!^{wYKp)9;)~?K8JjtKY&_4;wrq(vCCN`Vr>TEfD#b?ze+Jx& z9vv9)wzf8JDHJ}wE=e{os|zywS2K3)oUJpJ3cudA?Xo_wcX*g;r9#7IGRFN2_B+e6 z;vOl>rH>o%{cefLu`!>Xn9yy5gBP9r@aQNh@P3TQrbjyPPkXv$fPdM(QW~$rnrPqB zDQRkKjDvgkdUk3`<*Tozv!{m>f8*oqf9ffo86M`;;lqxg@jQ28t0RQ@2!FgGNzM+0 zaK(q0aW4Ehu8o@#^D68Xi=&#u)=HZxNY6kv37h?{DTax6) zPU+<}NwTg4RBcynRqZ2nd;8z={4Xs7d|FpYpE46iPYVQI-nrAs|o+j?$`{z4=Sh?<@AqiU2IN^Fc#7gImi|VW|=- zfHPP%5BHQq*#B>Pc0~XHX6*wxv^VUH{<=B zltWP05=6ze;F{C+PnYf?E2od_UnF^cF0*%EpQf6Q(FIVtXl$%#1xK**~w?e`?7GK9AN)A&0i!5R`)#?E0}7GyX5&KhhOwy3~}Xd#mCGuk-g%-lQoIp^Er z-kDMy$2&T!`oaSb=l7iFe9rm39r&+H_cOj(tL??!pTVA7>I*<+e-q(%!{>&BNxJf7 zqftFFfY-`WrTx651A-9&Ibg{G2@J?Uv`KI<+V351HpiC&klnH4vJ~(Ja41My3ZO@# z76Lh_uqh2S;{_&WtsqhX?gMqfKE*iP$qCE@B-mfH7PTZo+jze;Nj7e~qinfj zIKp#F0x<09mJle|B#GG;*nM(HSfXmpr<5q9tvmC))-ga1e|-Tg0K20|cKiEMB7;qa zo~4`s0xjh8#fr(?tP0A?R>uHSEngbIAP=}MvHhJpM1ppDa zZ8Kq?J`>|q#{iZ6>5Y^Kwlj$+b#w{_rtO>4aB4|eP}v`k+l^^k0%YS3;-P7CHKikU z`^1s}B23lcf8C2IQQ2gz=Cf!<1fT%Ur$iTQ8XL3m>qA&+7zPG= zrJ)?wHtb6?a87W298OK76oIfk%eMAPhX=E4Lk*a;J!xywJ~?Z@^IMF+bPVust(HQ! zR9?3mf3x?<&u6pjl~vML8}q#EmOPn~CR=rZTPdBaOK+d9suPR4U?I(bC+sRNV83pk zUm?vlVRxUD^@QMdiI$~-S$kwnmK`6xD<(1?p+@Z=a;Qbv*)J8{A)r?9I!OZ!d)MRA z*JJkhvH-Nx`Iw=Hz%wn9b>;s$fT%#$q zF1z}tux2c?O6k`Kqt{Y;y$Px$rtJ^L?C(0N0}rG1Qi#yCCIm%r-JU&{QpNuQ{suN# W67nlm{A|Yn0000 0 and n <= context['pages']] page_obj = context['page_obj'] paginator = context['paginator'] - + if context.has_key('criteria'): + criteria = context['criteria'] + else: + criteria ='' + return { 'page_obj': page_obj, 'paginator': paginator, @@ -37,7 +41,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'], + 'criteria' : criteria, } register.inclusion_tag('telemeta/paginator.html', takes_context=True)(paginator) -- 2.39.5