From: Jeff Godin <jgodin@tadl.org>
Date: Tue, 3 Apr 2012 14:37:24 +0000 (-0400)
Subject: Use library local patron barcode regex in myopac
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2901cca914e1e4ee48526b282b5ff89acea7268b;p=evergreen%2Ftadl.git

Use library local patron barcode regex in myopac

Use library local patron barcode regex in myopac, so that
username vs barcode detection will be correct.

The regex used at login is maintained outside of the skin,
so we're already set there.

Signed-off-by: Jeff Godin <jgodin@tadl.org>
---

diff --git a/Open-ILS/web/opac/skin/tadlv2/js/myopac.js b/Open-ILS/web/opac/skin/tadlv2/js/myopac.js
index 6b3046363b..40ea2ff601 100644
--- a/Open-ILS/web/opac/skin/tadlv2/js/myopac.js
+++ b/Open-ILS/web/opac/skin/tadlv2/js/myopac.js
@@ -1069,7 +1069,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)) {