[open-ils-commits] r289 - servres/trunk/conifer/templates (gfawcett)

[svn at svn.open-ils.org]

Author: gfawcett
Date: 2009-04-05 21:01:04 -0400 (Sun, 05 Apr 2009)
New Revision: 289

Modified:
   servres/trunk/conifer/templates/paginate.xhtml
   servres/trunk/conifer/templates/search_results.xhtml
Log:
fixed bug with paginator on search-results


Modified: servres/trunk/conifer/templates/paginate.xhtml
===================================================================
--- servres/trunk/conifer/templates/paginate.xhtml	2009-04-06 00:40:49 UTC (rev 288)
+++ servres/trunk/conifer/templates/paginate.xhtml	2009-04-06 01:01:04 UTC (rev 289)
@@ -18,16 +18,16 @@
   </table>
   <div class="pagination_controls" py:if="paginator.num_pages > 1">
     <span py:if="page.has_previous()" class="prev">
-      <a href=".?page=${page.previous_page_number()}&amp;count=${count}&amp;query=${query}&amp;target=${target}">Previous</a>
+      <a href=".?page=${page.previous_page_number()}&amp;count=${count}&amp;q=${query}&amp;target=${target}">Previous</a>
     </span>
     <span class="nums">
       <span py:for="pp in range(1, 1+paginator.num_pages)">
 	<a style="font-weight: ${pp == page_num and 'bold' or 'normal'}"
-	   href=".?page=${pp}&amp;count=${count}&amp;query=${query}&amp;target=${target}">${pp}</a>
+	   href=".?page=${pp}&amp;count=${count}&amp;q=${query}&amp;target=${target}">${pp}</a>
       </span>
     </span>
     <span py:if="page.has_next()" class="next">
-      <a href=".?page=${page.next_page_number()}&amp;count=${count}&amp;query=${query}&amp;target=${target}">Next</a>
+      <a href=".?page=${page.next_page_number()}&amp;count=${count}&amp;q=${query}&amp;target=${target}">Next</a>
     </span>
   </div>
 </div>

Modified: servres/trunk/conifer/templates/search_results.xhtml
===================================================================
--- servres/trunk/conifer/templates/search_results.xhtml	2009-04-06 00:40:49 UTC (rev 288)
+++ servres/trunk/conifer/templates/search_results.xhtml	2009-04-06 01:01:04 UTC (rev 289)
@@ -76,7 +76,7 @@
 	<td><a href="${item.course.course_url()}">${item.course.title}</a></td>
 	<td><span py:if="item.item_type=='PHYS'">${item.smallint()} &bull; ${item.barcode()}</span></td>
     </span>
-    ${pagetable(paginator, count, pagerow, pageheader)}
+    ${pagetable(paginator, count, pagerow, pageheader, query=query_string)}
 
 </body>
 </html>