added search filters and sorting to metarecord results page

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2@9066 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/opac/skin/default/js/search_bar.js b/Open-ILS/web/opac/skin/default/js/search_bar.js
index 0369744..c87d494 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/search_bar.js
+++ b/Open-ILS/web/opac/skin/default/js/search_bar.js
@@ -48,7 +48,7 @@ function searchBarInit() {
     }
 }
 
-function searchBarSubmit() {
+function searchBarSubmit(isFilterSort) {
 
        var text = G.ui.searchbar.text.value;
 
@@ -60,7 +60,7 @@ function searchBarSubmit() {
 
        var args = {};
 
-       if(SHOW_MR_DEFAULT) {
+       if(SHOW_MR_DEFAULT || (isFilterSort && findCurrentPage() == MRESULT)) {
                args.page                               = MRESULT;
        } else {
                args.page                               = RRESULT;

diff --git a/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml b/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml
index a6462c0..237be62 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml
@@ -13,7 +13,7 @@
                                        </i>
                                </td>
                 <td align='right'>
-                    <!--#if expr="$OILS_PAGE='rresult.xml'"-->
+                    <!--#if expr="$OILS_PAGE='rresult.xml' || $OILS_PAGE='mresult.xml'"-->
                     <!--#include virtual="../result/filtersort.xml" -->
                     <!--#endif -->
                 </td>

diff --git a/Open-ILS/web/opac/skin/default/xml/result/filtersort.xml b/Open-ILS/web/opac/skin/default/xml/result/filtersort.xml
index 6177b52..27eb382 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/result/filtersort.xml
+++ b/Open-ILS/web/opac/skin/default/xml/result/filtersort.xml
@@ -1,6 +1,6 @@
 <span>
-    &result.limit2avail;<input type='checkbox' id='opac.result.limit2avail' onclick='searchBarSubmit();'/>
-    <select id='opac.result.sort' onchange='searchBarSubmit();'>
+    &result.limit2avail;<input type='checkbox' id='opac.result.limit2avail' onclick='searchBarSubmit(true);'/>
+    <select id='opac.result.sort' onchange='searchBarSubmit(true);'>
         <option selected='selected' value=''>&result.sort_by;</option>
         <optgroup label='&result.sort_by.title;'>
             <option id='opac.result.title.a2z' label='&common.a2z.titla;' value='title.asc'>&common.a2z.title;</option>