From a4dc6d4ba1e72233d6823a39958943652fb908cc 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 +- Open-ILS/web/opac/skin/default/js/myopac.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Open-ILS/web/opac/common/js/opac_utils.js b/Open-ILS/web/opac/common/js/opac_utils.js index b699f46fc1..702ea0c02d 100644 --- a/Open-ILS/web/opac/common/js/opac_utils.js +++ b/Open-ILS/web/opac/common/js/opac_utils.js @@ -730,7 +730,7 @@ function doLogin(suppressEvents) { org : getOrigLocation() }; - 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; diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js index 925997ab20..ab53aa68ca 100644 --- a/Open-ILS/web/opac/skin/default/js/myopac.js +++ b/Open-ILS/web/opac/skin/default/js/myopac.js @@ -1071,7 +1071,7 @@ function myOPACUpdateUsername() { return; } - r = fetchOrgSettingDefault(globalOrgTree.id(), 'opac.barcode_regex'); + r = fetchOrgSettingDefault(getLocation(), 'opac.barcode_regex'); if(r) REGEX_BARCODE = new RegExp(r); if(username.match(REGEX_BARCODE)) { -- 2.11.0