From b84fa7bf4ed7d9a7825e89f9de1cdaf3c8c4179c Mon Sep 17 00:00:00 2001 From: erickson Date: Wed, 7 Dec 2005 16:33:07 +0000 Subject: [PATCH] setting orig location to location if unset checking isNaN on the depth before running a search git-svn-id: svn://svn.open-ils.org/ILS/trunk@2259 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/common/js/init.js | 1 + Open-ILS/web/opac/skin/default/js/search_bar.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Open-ILS/web/opac/common/js/init.js b/Open-ILS/web/opac/common/js/init.js index 0c330bf0cb..79c2fdd6ef 100644 --- a/Open-ILS/web/opac/common/js/init.js +++ b/Open-ILS/web/opac/common/js/init.js @@ -13,6 +13,7 @@ try{ attachEvt("common", "unload", cleanRemoteRequests);} catch(e){} function init() { runEvt('common','init'); + if( getOrigLocation() == 0 ) ORIGLOC = LOCATION; runEvt("common", "run"); //checkUserSkin(); G.ui.common.now_searching.appendChild(text(findOrgUnit(getLocation()).name())); 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 d472f4054e..0aa23d0839 100644 --- a/Open-ILS/web/opac/skin/default/js/search_bar.js +++ b/Open-ILS/web/opac/skin/default/js/search_bar.js @@ -143,6 +143,8 @@ function searchBarSubmit() { var text = G.ui.searchbar.text.value; if(!text || text == "") return; + var d = (newSearchDepth != null) ? newSearchDepth : parseInt(_ds.options[_ds.selectedIndex].value); + if(isNaN(d)) d = 0; var args = {}; args.page = MRESULT; @@ -150,7 +152,7 @@ function searchBarSubmit() { args[PARAM_TERM] = text; args[PARAM_STYPE] = _ts.options[_ts.selectedIndex].value; args[PARAM_LOCATION] = newSearchLocation; - args[PARAM_DEPTH] = (newSearchDepth != null) ? newSearchDepth : parseInt(_ds.options[_ds.selectedIndex].value); + args[PARAM_DEPTH] = d; args[PARAM_FORM] = _fs.options[_fs.selectedIndex].value; goTo(buildOPACLink(args)); -- 2.43.2