From f89451757975025a32ee2f3e2a72a907ba83bcd8 Mon Sep 17 00:00:00 2001
From: Dan Reuther <dreuther@catalystitservices.com>
Date: Thu, 5 Mar 2015 19:12:18 -0500
Subject: [PATCH] KMAIN-1619 Advanced Sort Relevance Bug

Added a storage string to window.name, which allows the sort result
filter to persist across multiple advanced queries in the same tab

cross port of 2482783

Signed-off-by: Dan Reuther <dreuther@catalystitservices.com>

	modified:   KCLS/openils/var/templates_kcls/opac/parts/advanced/search.tt2
	modified:   KCLS/openils/var/templates_kcls/opac/parts/filtersort.tt2
	modified:   Open-ILS/web/js/ui/default/opac/simple.js
---
 KCLS/openils/var/templates_kcls/opac/parts/advanced/search.tt2 | 7 +++++++
 KCLS/openils/var/templates_kcls/opac/parts/filtersort.tt2      | 4 +++-
 Open-ILS/web/js/ui/default/opac/simple.js                      | 8 ++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

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 374a50906a..fd93a5e16a 100644
--- a/KCLS/openils/var/templates_kcls/opac/parts/advanced/search.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/parts/advanced/search.tt2
@@ -146,6 +146,13 @@
     var pubdateSel = $("adv_global_pub_date_type");
     var orgSel = document.getElementById("org_selector");
     var sortBySel = document.getElementById("opac.result.sort");
+    
+	/*Part of a hack to keep the Sort Results order selector persistent across multiple searches in single tab 
+		 see filtersort.tt2 and simple.js*/
+    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/parts/filtersort.tt2 b/KCLS/openils/var/templates_kcls/opac/parts/filtersort.tt2
index e87dbd242b..72072ca2c7 100644
--- a/KCLS/openils/var/templates_kcls/opac/parts/filtersort.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/parts/filtersort.tt2
@@ -1,4 +1,6 @@
-<select class="results_header_sel" id='opac.result.sort' name="sort"
+	<!-- Onchange below is part of a hack to keep the Sort Results order selector persistent across multiple searches in single tab 
+		 see templates_kcls/opac/parts/search.tt2 and simple.js-->
+<select class="results_header_sel" id='opac.result.sort' name="sort" onchange="setPersistentSort();"
     [% IF submit_on_change %]onchange='this.form.submit()'[% END %]>
     <option value=''>[% l("Sort by Relevance") %]</option>
     <optgroup label='[% l("Sort by Title") %]'>
diff --git a/Open-ILS/web/js/ui/default/opac/simple.js b/Open-ILS/web/js/ui/default/opac/simple.js
index c1138147bc..aa7226335c 100644
--- a/Open-ILS/web/js/ui/default/opac/simple.js
+++ b/Open-ILS/web/js/ui/default/opac/simple.js
@@ -119,3 +119,11 @@ function exclude_onchange(checkbox) {
 
     checkbox.form.submit();
 }
+
+// Dirty hack to keep the Sort Results order selector persistent in 
+// multiple searches in same tab (see 
+// openils/var/templates_kcls/opac/parts/advanced.tt2)
+function setPersistentSort() {
+	    window.name = (document.getElementById("opac.result.sort")).selectedIndex;
+}
+
-- 
2.11.0