[open-ils-commits] [GIT] Evergreen ILS branch rel_3_3 updated. d1251ca741ca4ffc4b063286acecdc0f88ac1605

[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_3 has been updated
       via  d1251ca741ca4ffc4b063286acecdc0f88ac1605 (commit)
       via  88902bee279908b324c3518591b7ce83c5378d72 (commit)
       via  a2d03a5d6323e8a89579d1e0324b0eba81120f70 (commit)
      from  1412d3f304b32bb5dd7bdb80dcfc432a80248255 (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 d1251ca741ca4ffc4b063286acecdc0f88ac1605
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 8af37e6700..f70374173c 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
@@ -1870,16 +1870,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 88902bee279908b324c3518591b7ce83c5378d72
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 489d6a590e..8af37e6700 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
@@ -1870,6 +1870,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 a2d03a5d6323e8a89579d1e0324b0eba81120f70
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 ea29c0de5d..489d6a590e 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
@@ -1870,7 +1870,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