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

[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  5f50e2f71f3261201f560fc4c9acc6c5a04a7a40 (commit)
       via  d4155b5b2741005a1002e9bb6c9fbdf68a81e03f (commit)
       via  ddf5b4b34c9cac881f3ccbf693b191e2b06cf2fc (commit)
      from  da42d5649ea4bc12a2d2ab28d4bddca15ad0278d (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 5f50e2f71f3261201f560fc4c9acc6c5a04a7a40
Author: Jason Boyer <JBoyer at eoli.info>
Date:   Wed Apr 1 08:57:53 2020 -0400

    LP1774268: Tidy up hold notification testing
    
    Signed-off-by: Jason Boyer <JBoyer at eoli.info>

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 b3a5cda829..4a340bd305 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
@@ -1897,16 +1897,13 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
     function extract_hold_notify() {
         var p = $scope.patron;
         var notify = $scope.user_settings['opac.hold_notify'];
-        if (notify === '') {
-           $scope.hold_notify_type.phone = false;
-           $scope.hold_notify_type.email = false;
-           return;
-        }
-        if (!notify) {
-           $scope.hold_notify_type.phone = true;
-           $scope.hold_notify_type.email = true;
-           return;
+
+        if (!notify && !(notify === '')) {
+            $scope.hold_notify_type.phone = true;
+            $scope.hold_notify_type.email = true;
+            return;
         }
+
         $scope.hold_notify_type.phone = Boolean(notify.match(/phone/));
         $scope.hold_notify_type.email = Boolean(notify.match(/email/));
         $scope.hold_notify_type.sms = Boolean(notify.match(/sms/));

commit d4155b5b2741005a1002e9bb6c9fbdf68a81e03f
Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
Date:   Wed Feb 19 12:36:30 2020 -0800

    LP#1774268: handle opac.hold_notify empty string in AngJS patron editor
    
    If a patron does not want either phone or email hold notifications,
    their opac.hold_notify user setting will be an empty string.  Let's
    ensure that the hold notify checkboxes remain unchecked in the patron
    editor when that is the case.
    
    Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
    Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
    Signed-off-by: Jason Boyer <JBoyer at eoli.info>

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 f8c5ca7106..b3a5cda829 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
@@ -1897,6 +1897,11 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
     function extract_hold_notify() {
         var p = $scope.patron;
         var notify = $scope.user_settings['opac.hold_notify'];
+        if (notify === '') {
+           $scope.hold_notify_type.phone = false;
+           $scope.hold_notify_type.email = false;
+           return;
+        }
         if (!notify) {
            $scope.hold_notify_type.phone = true;
            $scope.hold_notify_type.email = true;

commit ddf5b4b34c9cac881f3ccbf693b191e2b06cf2fc
Author: Suzanne Paterno <paterno at noblenet.org>
Date:   Tue Aug 6 11:29:57 2019 -0400

    LP 1774268: Default Hold Notification checkboxes
    
    On patron edit screen set the email and phone notification
    to true when patron doesn't have any prefernces. This mimics
    the behavior in the xul client.
    
    Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
    Signed-off-by: Jason Boyer <JBoyer at eoli.info>

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 72a9ebd863..f8c5ca7106 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
@@ -1896,8 +1896,12 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
 
     function extract_hold_notify() {
         var p = $scope.patron;
-        var notify = $scope.user_settings['opac.hold_notify'] || '';
-
+        var notify = $scope.user_settings['opac.hold_notify'];
+        if (!notify) {
+           $scope.hold_notify_type.phone = true;
+           $scope.hold_notify_type.email = true;
+           return;
+        }
         $scope.hold_notify_type.phone = Boolean(notify.match(/phone/));
         $scope.hold_notify_type.email = Boolean(notify.match(/email/));
         $scope.hold_notify_type.sms = Boolean(notify.match(/sms/));

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

Summary of changes:
 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Evergreen ILS