From d945c12c1d5e110830690afcedf86a4bfced75c7 Mon Sep 17 00:00:00 2001 From: Jeff Godin Date: Sun, 28 Aug 2011 19:06:02 -0400 Subject: [PATCH] Use location-specific opac.barcode_regex Instead of fetching the opac.barcode_regex setting based on globalOrgTree.id(), use the value of getLocation(). This is useful in situations where a system within a consortium uses a different barcode regex than the rest of the consortium. Signed-off-by: Jeff Godin --- Open-ILS/web/opac/common/js/opac_utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Open-ILS/web/opac/common/js/opac_utils.js b/Open-ILS/web/opac/common/js/opac_utils.js index 78557b6e04..ef42bc116f 100644 --- a/Open-ILS/web/opac/common/js/opac_utils.js +++ b/Open-ILS/web/opac/common/js/opac_utils.js @@ -729,7 +729,7 @@ function doLogin(suppressEvents) { agent : 'opac' }; - r = fetchOrgSettingDefault(globalOrgTree.id(), 'opac.barcode_regex'); + r = fetchOrgSettingDefault(getLocation(), 'opac.barcode_regex'); if(r) REGEX_BARCODE = new RegExp(r); if( uname.match(REGEX_BARCODE) ) args.barcode = uname; -- 2.11.0