From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 10 Aug 2006 17:07:59 +0000 (+0000)
Subject: only setting default search location if the user explicity sets it
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e7075acb3ec4b1c2962e8701afc58b668b4f143b;p=evergreen%2Fpines.git

only setting default search location if the user explicity sets it


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

diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js
index 0c71e80992..a5677c1a91 100644
--- a/Open-ILS/web/opac/skin/default/js/myopac.js
+++ b/Open-ILS/web/opac/skin/default/js/myopac.js
@@ -578,9 +578,13 @@ function myOPACSavePrefs() {
 	G.user.prefs[PREF_HITS_PER] = getSelectorVal($('prefs_hits_per'));
 	G.user.prefs[PREF_DEF_FONT] = getSelectorVal($('prefs_def_font'));
 	G.user.prefs[PREF_HOLD_NOTIFY] = getSelectorVal($('prefs_hold_notify'));
-	G.user.prefs[PREF_DEF_LOCATION] = getSelectorVal($('prefs_def_location'));
 	G.user.prefs[PREF_DEF_DEPTH] = getSelectorVal($('prefs_def_range'));
 
+	if( $('myopac_pref_home_lib').checked == true )
+		G.user.prefs[PREF_DEF_LOCATION] = null;
+	else
+		G.user.prefs[PREF_DEF_LOCATION] = getSelectorVal($('prefs_def_location'));
+
 	if(commitUserPrefs())
 		alert($('prefs_update_success').innerHTML);
 	else alert($('prefs_update_failure').innerHTML);
@@ -628,11 +632,18 @@ function myOPACShowDefLocation() {
 	var selector = $('prefs_def_location');
 	var rsel = $('prefs_def_range');
 
-	var org = G.user.prefs[PREF_DEF_LOCATION];
-	if(!org) org = G.user.home_ou();
-
 	if(!defSearchLocationDrawn) {
+
 		defSearchLocationDrawn = true;
+
+		var org = G.user.prefs[PREF_DEF_LOCATION];
+
+		if(!org) {
+			$('myopac_pref_home_lib').checked = true;
+			$('prefs_def_location').disabled = true;
+			org = G.user.home_ou();
+		}
+
 		buildOrgSel(selector, globalOrgTree, 0);
 
 		globalOrgTypes = globalOrgTypes.sort(
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_prefs.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_prefs.xml
index 431cd1175b..e86ed408aa 100644
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_prefs.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_prefs.xml
@@ -59,6 +59,13 @@
 			<tr>
 				<td>Default Search Location</td>
 				<td>
+					<div style='margin-bottom: 5px;'>
+						<input type='checkbox' id='myopac_pref_home_lib' 
+							onclick='
+								if( this.checked ) $("prefs_def_location").disabled = true;
+								else $("prefs_def_location").disabled = false;
+							'> </input> Always search my home library by default.
+					</div>
 					<select id='prefs_def_location'>
 					</select>
 				</td>