LP1774268: Stop treating undefined settings as special user/jboyer/lp1774268_default_notify_master
authorJason Boyer <JBoyer@eoli.info>
Wed, 1 Apr 2020 11:10:42 +0000 (07:10 -0400)
committerJason Boyer <JBoyer@eoli.info>
Wed, 1 Apr 2020 11:10:42 +0000 (07:10 -0400)
Rather than have to treat an undefined hold notification
setting as a specificcombination of values, just make it
explicit and then save them.

Signed-off-by: Jason Boyer <JBoyer@eoli.info>
Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js

index b3a5cda..b017ed7 100644 (file)
@@ -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 === '')) {
+            // This is where an OUS for default hold notification types could be used.
+            notify = "phone:email";
+            $scope.user_settings['opac.hold_notify'] = notify;
         }
+
         $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/));