Added limit2available on advanced search page

made sort and limit options sticky accorss advanced and results pages
removed old commented-out code

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

diff --git a/Open-ILS/web/opac/skin/default/js/adv_global.js b/Open-ILS/web/opac/skin/default/js/adv_global.js
index f49d2e4..1aac9ac 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/adv_global.js
+++ b/Open-ILS/web/opac/skin/default/js/adv_global.js
@@ -33,6 +33,16 @@ function advgInit() {
        var input = $n($('adv_global_trow'), 'term');
        input.focus();
        setEnterFunc(input, advSubmitGlobal);
+
+    if(getSort() && getSortDir()) {
+           setSelector($('adv_global_sort_by'), getSort());
+           setSelector($('adv_global_sort_dir'), getSortDir());
+        if(getSort() != 'rel')
+            $('adv_global_sort_dir').disabled = false;
+    }
+
+    if(getAvail())
+        $('opac.result.limit2avail').checked = true;
 }
 
 function advAddGblRow() {
@@ -94,6 +104,7 @@ function advSubmitGlobal() {
        var itemtypes = advGetVisSelectorVals('adv_global_item_type');
        var audiences = advGetVisSelectorVals('adv_global_audience');
        var languages = getSelectedList($('adv_global_lang')) + '';     
+    var limit2avail = $('opac.result.limit2avail').checked ? 1 : ''
 
        var searches = advBuildSearchBlob();
        if(!searches) return;
@@ -115,6 +126,7 @@ function advSubmitGlobal() {
        args[PARAM_ADVTYPE]     = ADVTYPE_MULTI;
        args[PARAM_STYPE]               = "";
        args[PARAM_TERM]                = "";
+       args[PARAM_AVAIL]               = limit2avail;
 
        /* pubdate sorting causes a record (not metarecord) search */
        if( sortby == SORT_TYPE_PUBDATE || !$('adv_group_titles').checked ) {

diff --git a/Open-ILS/web/opac/skin/default/js/advanced.js b/Open-ILS/web/opac/skin/default/js/advanced.js
index 27e9994..12728c1 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/advanced.js
+++ b/Open-ILS/web/opac/skin/default/js/advanced.js
@@ -5,7 +5,6 @@ attachEvt("common", "run", advInit);
 function advInit() { 
 
        /* propogate these? */
-       clearSearchParams();
 
        depthSelInit(); 
        setEnterFunc( $n( $('advanced.marc.tbody'), 'advanced.marc.value'), advMARCRun );
@@ -34,6 +33,8 @@ function advAddMARC() {
 
 function advMARCRun() {
 
+       clearSearchParams();
+
        var div = $('adv_marc_search_sidebar');
        var tbodies = div.getElementsByTagName('tbody');
        var searches = [];
@@ -77,6 +78,7 @@ function advExtractMARC(tbody) {
 }
 
 function advGenericSearch() {
+       clearSearchParams();
        var type = getSelectorVal($('adv_quick_type'));
        
        var term = $('adv_quick_text').value;

diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
index 3a0db70..f09d760 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
+++ b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
@@ -46,33 +46,12 @@
 
                <td rowspan='2'>
 
-                       <!--
-                       <table width='100%' style='margin-bottom: 3px;'>
-                               <thead>
-                                       <tr>
-                                               <td colspan='2' align='center'>
-                                                       <span>Group Formats and Editions</span>
-                                                       <input id='adv_group_titles' type='checkbox' checked='checked' />
-                                               </td>
-                                       </tr>
-                               </thead>
-                       </table>
-                       -->
-
                        <table width='100%'>
                                <thead>
                                        <tr><td colspan='2' align='center'>&advanced.search.filters;</td></tr>
                                </thead>
                                <tbody>
 
-                                       <!--
-                                       <tr>
-                                               <td align='right'>Search Range</td>
-                                               <td align='left'>
-                                                       <   #include virtual="../common/libselect.xml"  >
-                                               </td>
-                                       </tr>
-                                       -->
                                        <tr>
                                                <td align='right'>
                                                        <span>&advanced.item.form;</span>
@@ -198,20 +177,6 @@
        <tr style='border-top: none;'>
                <td align='center' valign='bottom' style='border-top: none;'>
 
-                       <!--
-                       <table width='100%' style='padding: 1px;'>
-                               <thead>
-                                       <tr>
-                                               <td colspan='2' align='center'>
-                                                       <span>Group Formats and Editions</span>
-                                                       <input id='adv_group_titles' type='checkbox' checked='checked' />
-                                               </td>
-                                       </tr>
-                               </thead>
-                       </table>
-                       -->
-
-
                        <table style='border: none; width: 100%;'>
                                <tr>
                                        <td align='center' width='100%'>
@@ -271,13 +236,14 @@
 
                                                                </tr>
                                                                <tr>
-                                                                       <td colspan='2' align='center'>
+                                                                       <td align='center'>
                                                                                <span>&advanced.frbrize;</span>
-                                                                               <!--
-                                                                               <input id='adv_group_titles' type='checkbox' checked='checked' />
-                                                                               -->
                                                                                <input id='adv_group_titles' type='checkbox' />
                                                                        </td>
+                                    <td align='center'>
+                                        <span>&result.limit2avail;</span>
+                                        <input type='checkbox' id='opac.result.limit2avail'/>
+                                    </td>
                                                                </tr>
                                                        </tbody>
                                                </table>