[open-ils-commits] [GIT] Evergreen ILS branch rel_3_4 updated. ca79b7f8e10f61ebb7ec13f4e8d7e0759a7b5f61

[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_4 has been updated
       via  ca79b7f8e10f61ebb7ec13f4e8d7e0759a7b5f61 (commit)
       via  618e4050c4771e2d8238d951b06a456309f6db82 (commit)
       via  bd069662231ec41b25bf22c795ff33d568e028b1 (commit)
      from  188f6080ba4f75602761784149b34cbee0b59bb4 (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 ca79b7f8e10f61ebb7ec13f4e8d7e0759a7b5f61
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 81a419f27f..fdf6f86cd8 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
@@ -1871,16 +1871,13 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
 
     function extract_hold_notify() {
         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 618e4050c4771e2d8238d951b06a456309f6db82
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 1b33d52792..81a419f27f 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
@@ -1871,6 +1871,11 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
 
     function extract_hold_notify() {
         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 bd069662231ec41b25bf22c795ff33d568e028b1
Author: Suzanne Paterno <paterno at noblenet.org>
Date:   Tue Aug 6 11:29:57 2019 -0400

    LP 1774268
    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 5949658912..1b33d52792 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
@@ -1871,7 +1871,11 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
 
     function extract_hold_notify() {
         var notify = $scope.user_settings['opac.hold_notify'];
-        if (!notify) return;
+        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