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 <jgodin@tadl.org>

diff --git a/Open-ILS/web/opac/common/js/opac_utils.js b/Open-ILS/web/opac/common/js/opac_utils.js
index 78557b6..ef42bc1 100644 (file)
--- 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;