fixed bug with paginator on search-results

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@289 6d9bc8c9-1ec2-4278-b937-99fde70a366f

diff --git a/conifer/templates/paginate.xhtml b/conifer/templates/paginate.xhtml
index 2fe6e41..2a173df 100644 (file)
--- a/conifer/templates/paginate.xhtml
+++ b/conifer/templates/paginate.xhtml
@@ -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>

diff --git a/conifer/templates/search_results.xhtml b/conifer/templates/search_results.xhtml
index bb7f3e4..80b88c5 100644 (file)
--- a/conifer/templates/search_results.xhtml
+++ b/conifer/templates/search_results.xhtml
@@ -76,7 +76,7 @@ courses = course_list
        <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>