From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 7 Aug 2008 13:26:27 +0000 (+0000)
Subject: pull org location from URL param "l" .. default to org tree root
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c93d966bebe0f4c08257ae1b7581df49e44ba27b;p=Evergreen.git

pull org location from URL param "l" .. default to org tree root

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2_3@10292 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/web/opac/extras/selfcheck/selfcheck.js b/Open-ILS/web/opac/extras/selfcheck/selfcheck.js
index fa672ac65c..45ae925722 100644
--- a/Open-ILS/web/opac/extras/selfcheck/selfcheck.js
+++ b/Open-ILS/web/opac/extras/selfcheck/selfcheck.js
@@ -33,6 +33,7 @@ var successfulItems = {};
 var scanTimeout = 800;
 var scanTimeoutId;
 var patronBarcodeRegex;
+var orgUnit;
 
 
 function selfckInit() {
@@ -41,13 +42,12 @@ function selfckInit() {
 
     selfckSetupPrinter();
 
-    /*
-    XXX we need org information (from the proxy?)
-    var t = fetchOrgSettingDefault(1, 'circ.selfcheck.patron_login_timeout');
+    orgUnit = findOrgUnitSN(cgi.param('l')) || globalOrgTree;
+
+    var t = fetchOrgSettingDefault(orgUnit.id(), 'circ.selfcheck.patron_login_timeout');
     patronTimeout = (t) ? parseInt(t) * 1000 : patronTimeout;
-    */
 
-    var reg = fetchOrgSettingDefault(globalOrgTree.id(), 'opac.barcode_regex');
+    var reg = fetchOrgSettingDefault(orgUnit.id(), 'opac.barcode_regex');
     if(reg) patronBarcodeRegex = new RegExp(reg);
 
     if(!staff) {