[open-ils-commits] [GIT] Evergreen ILS branch rel_3_5 updated. a2c9243154f56257a3d0a3319d4806f6169086b4

[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, rel_3_5 has been updated
       via  a2c9243154f56257a3d0a3319d4806f6169086b4 (commit)
       via  7ba1e62aab334b962031036fcd167c26e26a624b (commit)
       via  58b931258646c8c7ef50db4134e102d075efc80b (commit)
      from  a2902598139e40eb02d57f9197a3f710b54f93ee (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 a2c9243154f56257a3d0a3319d4806f6169086b4
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 7ba1e62aab334b962031036fcd167c26e26a624b
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 58b931258646c8c7ef50db4134e102d075efc80b
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