[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. 1668ebdc61e660c753e2428144ecf5515face8fd

Evergreen Git git at git.evergreen-ils.org
Thu Aug 31 00:48:15 EDT 2017


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, rel_2_12 has been updated
       via  1668ebdc61e660c753e2428144ecf5515face8fd (commit)
       via  6cc311f5fd01b0f3467612921afebdfe5bab6f63 (commit)
      from  769198bfb2935a90df96e81febc0392c30e9df58 (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 1668ebdc61e660c753e2428144ecf5515face8fd
Author: Bill Erickson <berickxx at gmail.com>
Date:   Fri Jul 21 14:50:17 2017 -0400

    LP#1695029 Patron reg. supports bool opt-in defaults
    
    Support default values for boolean user opt-in settings during patron
    registration.  A default value of True, true, T, or t (or really
    anything starting with a 't') is treated as true.  Any other value
    (including null) means false.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Josh Stompro <stomproj at larl.org>
    Signed-off-by: Jason Etheridge <jason at EquinoxInitiative.org>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
index d3986f1..61d3f58 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
@@ -499,8 +499,14 @@ angular.module('egCoreMod')
                 // apply default user setting values
                 angular.forEach(setting_types, function(stype, index) {
                     if (stype.reg_default() != undefined) {
-                        service.user_settings[stype.name()] =
-                            Boolean(stype.reg_default());
+                        var val = stype.reg_default();
+                        if (stype.datatype() == 'bool') {
+                            // A boolean user setting type whose default 
+                            // value starts with t/T is considered 'true',
+                            // false otherwise.
+                            val = Boolean((val+'').match(/^t/i));
+                        }
+                        service.user_settings[stype.name()] = val;
                     }
                 });
             }

commit 6cc311f5fd01b0f3467612921afebdfe5bab6f63
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date:   Tue Jun 27 15:06:48 2017 -0400

    LP#1695029-Webstaff Fix Patron Registration page never loading
    
    It looks like there was a variable mistype causing the page
    to not load, but the setting that the lp bug mentions wasn't being
    properly bound and needed to be wrapped to a boolean.
    
    Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    Signed-off-by: Josh Stompro <stomproj at larl.org>
    Signed-off-by: Rogan Hamby <rogan.hamby at gmail.com>
    
    Signed-off-by: Jason Etheridge <jason at EquinoxInitiative.org>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
index f40a9c0..d3986f1 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
@@ -499,8 +499,8 @@ angular.module('egCoreMod')
                 // apply default user setting values
                 angular.forEach(setting_types, function(stype, index) {
                     if (stype.reg_default() != undefined) {
-                        service.user_settings[setting.name()] = 
-                            setting.reg_default();
+                        service.user_settings[stype.name()] =
+                            Boolean(stype.reg_default());
                     }
                 });
             }

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

Summary of changes:
 .../web/js/ui/default/staff/circ/patron/regctl.js  |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list