KMAIN 1685

	Added a defaultsearch get paramater to allow the default search option
	to be passed to browse when clicking the browse search link on the
	advanced search page. Fixed issue where sort would be overridden by the advanced search result page

	modified:   KCLS/openils/var/templates_kcls/opac/advanced.tt2
	modified:   KCLS/openils/var/templates_kcls/opac/browse_results.tt2
	modified:   KCLS/openils/var/templates_kcls/opac/parts/advanced/browse.tt2
	modified:   KCLS/openils/var/templates_kcls/opac/parts/advanced/search.tt2
	modified:   KCLS/openils/var/templates_kcls/opac/results.tt2

Signed-off-by: Michael Glass <mglass@catalystitservices.com>

diff --git a/KCLS/openils/var/templates_kcls/opac/advanced.tt2 b/KCLS/openils/var/templates_kcls/opac/advanced.tt2
index 6f8514b..ed3edba 100644 (file)
--- a/KCLS/openils/var/templates_kcls/opac/advanced.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/advanced.tt2
@@ -3,17 +3,16 @@
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Advanced Search");
     pane = CGI.param("pane") || "advanced";
-    sort = CGI.param("sort") || "pubdate.descending";
-
+    sort = CGI.param("defaultsort") || CGI.param("sort") ||  "pubdate.descending";
     loc = ctx.search_ou;
 -%]
     <div id="search-wrapper">
         <div id="adv_search_parent">
             <div id="adv_search_tabs">
-                <a href="?pane=browse;sort=[%sort%]" alt="[% l('Browse Search') %]" [% IF pane == 'browse' %]class="on" [% END %]id="browse_search"></a>
-                <a href="?pane=advanced;sort=[%sort%]" alt="[% l('Advanced Search') %]" [% IF pane == 'advanced' %]class="on" [% END %]id="adv_search"></a>
-                <a href="?pane=numeric;sort=[%sort%]" alt="[% l('Numeric Search') %]" [% IF pane == 'numeric' %]class="on" [% END %]id="num_search"></a>
-                <a href="?pane=expert;sort=[%sort%]" alt="[% l('Expert Search') %]" [% IF pane == 'expert' %]class="on" [% END %]id="expert_search"></a>
+                <a href="?pane=browse;sort=[%sort%];defaultsort=[%sort%]" alt="[% l('Browse Search') %]" [% IF pane == 'browse' %]class="on" [% END %]id="browse_search"></a>
+                <a href="?pane=advanced;sort=[%sort%];defaultsort=[%sort%]" alt="[% l('Advanced Search') %]" [% IF pane == 'advanced' %]class="on" [% END %]id="adv_search"></a>
+                <a href="?pane=numeric;sort=[%sort%];defaultsort=[%sort%]" alt="[% l('Numeric Search') %]" [% IF pane == 'numeric' %]class="on" [% END %]id="num_search"></a>
+                <a href="?pane=expert;sort=[%sort%];defaultsort=[%sort%]" alt="[% l('Expert Search') %]" [% IF pane == 'expert' %]class="on" [% END %]id="expert_search"></a>
             </div>
         </div>
     </div>

diff --git a/KCLS/openils/var/templates_kcls/opac/browse_results.tt2 b/KCLS/openils/var/templates_kcls/opac/browse_results.tt2
index ecbf1bc..d9a585e 100644 (file)
--- a/KCLS/openils/var/templates_kcls/opac/browse_results.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/browse_results.tt2
@@ -8,7 +8,7 @@
 
     ctx.page_title = l("Browse the Catalog");
     blimit = CGI.param('blimit') || ctx.opac_hits_per_page || 11;
-    sort = CGI.param('sort') || "pubdate.descending";
+    sort = CGI.param('sort') || CGI.param('defaultsort') ||"pubdate.descending";
 
     depart_list = ['blimit', 'bterm', 'bpivot'];
 %]

diff --git a/KCLS/openils/var/templates_kcls/opac/parts/advanced/browse.tt2 b/KCLS/openils/var/templates_kcls/opac/parts/advanced/browse.tt2
index b85acd0..d7f7072 100644 (file)
--- a/KCLS/openils/var/templates_kcls/opac/parts/advanced/browse.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/parts/advanced/browse.tt2
@@ -2,7 +2,7 @@
     # This page is loaded from advanced.tt2
     
     blimit = CGI.param('blimit') || ctx.opac_hits_per_page || 11;
-    sort = CGI.param("sort") || "pubdate.descending";
+    sort = CGI.param("defaultsort") || CGI.param("sort") ||  "pubdate.descending";
 %]
 
 [% # browse search form %]

diff --git a/KCLS/openils/var/templates_kcls/opac/parts/advanced/search.tt2 b/KCLS/openils/var/templates_kcls/opac/parts/advanced/search.tt2
index fd93a5e..37732d7 100644 (file)
--- a/KCLS/openils/var/templates_kcls/opac/parts/advanced/search.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/parts/advanced/search.tt2
@@ -3,6 +3,7 @@
     PROCESS get_library;
 %]
 <form id="adv_search_form" action="[% ctx.opac_root %]/results" method="get">
+       <input type="hidden" name="defaultsort" value=[% CGI.param("defaultsort") || CGI.param("sort") %] />
     <table id='adv_global_search' class='data_grid data_grid_center' width='100%'>
         <tr style='border-bottom: none;'>
             <!-- Contains the user-addable(?) rows to define search class, containment and text -->
@@ -152,7 +153,6 @@
     if (window.name != "browser_browser") {
                (document.getElementById("opac.result.sort")).selectedIndex = window.name;
        }
-       
     var resultViewSel = document.getElementById("resultViewSel");
     var modCheck = document.getElementById("opac.result.limit2avail");
     var templateSel = document.getElementById("templateList");

diff --git a/KCLS/openils/var/templates_kcls/opac/results.tt2 b/KCLS/openils/var/templates_kcls/opac/results.tt2
index 5f9df7c..19bb1d5 100644 (file)
--- a/KCLS/openils/var/templates_kcls/opac/results.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/results.tt2
@@ -15,6 +15,7 @@
     page_count = ctx.page_size == 0 ? 1 : POSIX.ceil(ctx.hit_count / ctx.page_size);
 %]
     <form action="[% ctx.opac_root %]/results" method="GET" onsubmit='clearRecIds()'>
+    <input type="hidden" name="defaultsort" value=[% CGI.param("defaultsort") || CGI.param("sort") %] />
     <div id="search-wrapper">
         [% INCLUDE "opac/parts/searchbar.tt2" took_care_of_form=1 %]
     </div>