[open-ils-commits] [GIT] Evergreen ILS branch master updated. 278c099a5f721b5955aa6869839aec579ce078e5

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  278c099a5f721b5955aa6869839aec579ce078e5 (commit)
       via  54a256fae3d194b3922856c9a46921951fd7a38d (commit)
      from  0dccf2a2a7f912d5c0f314819205249cbda247f6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 278c099a5f721b5955aa6869839aec579ce078e5
Author: Terran McCanna <tmccanna at georgialibraries.org>
Date:   Mon Jun 6 13:38:32 2016 -0400

    LP#1528647 Self-check only accepts user name value if regex for barcode
    not set up
    
    The original fix only worked if password was not required for self-check.
    This fix allows it to work when password is required as well.
    
    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/web/js/dojo/openils/User.js b/Open-ILS/web/js/dojo/openils/User.js
index ef17bf8..93a1212 100644
--- a/Open-ILS/web/js/dojo/openils/User.js
+++ b/Open-ILS/web/js/dojo/openils/User.js
@@ -124,8 +124,12 @@ if(!dojo._hasResource["openils.User"]) {
             if (!args.passwd) args.passwd = _u.passwd;
             if (!args.agent) args.agent = _u.login_agent;
             if (!args.type) args.type = _u.type;
-
-            var initReq = OpenSRF.CachedClientSession('open-ils.auth').request('open-ils.auth.authenticate.init', args.username);
+            
+            if (args.username) {
+                var initReq = OpenSRF.CachedClientSession('open-ils.auth').request('open-ils.auth.authenticate.init', args.username);
+            } else {
+                var initReq = OpenSRF.CachedClientSession('open-ils.auth').request('open-ils.auth.authenticate.init', args.barcode);
+            }
     
             initReq.oncomplete = function(r) {
                 var seed = r.recv().content(); 

commit 54a256fae3d194b3922856c9a46921951fd7a38d
Author: Bob Wicksall <bwicksall at pls-net.org>
Date:   Mon Jun 6 13:35:28 2016 -0400

    LP#1528647 Self-check only accepts user name value if regex
    for barcode not set up
    
    This fix allows a patron to log into the self-check interface with either
    a barcode or a user name.
    
    Written by: Bob Wicksall <bwicksall at pls-net.org>
    
    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
index 3959fbc..9182e44 100644
--- a/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
+++ b/Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
@@ -331,8 +331,12 @@ SelfCheckManager.prototype.loadOrgSettings = function() {
             this.orgSettings[k] = settings[k].value;
     }
 
-    if(settings[SET_BARCODE_REGEX]) 
+    if(settings[SET_BARCODE_REGEX]) {
         this.patronBarcodeRegex = new RegExp(settings[SET_BARCODE_REGEX].value);
+    } else {
+        this.patronBarcodeRegex = new RegExp(/^\d/); 
+        // this assumes barcodes start with digits
+    }
 
     // Subtract the timeout warning interval from the configured timeout 
     // so that when taken together they add up to the configured amount.

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/js/dojo/openils/User.js               |    8 ++++++--
 .../web/js/ui/default/circ/selfcheck/selfcheck.js  |    6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS