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

[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  edc503b788fd587b014932b0b2fbaf44b295d170 (commit)
       via  688e8e1a2df9b45099799d31c90b245147758e4c (commit)
      from  5fdb9b0b78f22accebd9760fff5771582bb4179d (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 edc503b788fd587b014932b0b2fbaf44b295d170
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 0ec59df..92c4a5f 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
@@ -516,8 +516,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 688e8e1a2df9b45099799d31c90b245147758e4c
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 6d9ddc8..0ec59df 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
@@ -516,8 +516,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