Make the 'Send email' and 'Quiet' options mutually exclusive

https://forum.openmediavault.org/index.php?thread/50231-usb-backup-emails-not-sent/
openmediavault · Nov 12, 2023 · 2a300a3 · 2a300a3
1 parent b0bc895
commit 2a300a3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/deb/openmediavault-usbbackup/debian/changelog b/deb/openmediavault-usbbackup/debian/changelog
@@ -1,3 +1,9 @@
+openmediavault-usbbackup (6.0.5-1) stable; urgency=low
+
+  * Make the 'Send email' and 'Quiet' options mutually exclusive.
+
+ -- Volker Theile <volker.theile@openmediavault.org>  Sun, 12 Nov 2023 18:58:37 +0100
+
 openmediavault-usbbackup (6.0.4-1) stable; urgency=low
 
   * Update locale files.

diff --git a/.../usr/share/openmediavault/workbench/component.d/omv-services-usbbackup-job-form-page.yaml b/.../usr/share/openmediavault/workbench/component.d/omv-services-usbbackup-job-form-page.yaml
@@ -63,11 +63,37 @@ data:
         label: _("Send email")
         value: true
         hint: _("An email message with the command output (if any produced) is send to the administrator.")
+        validators:
+          custom:
+            - constraint:
+                operator: or
+                arg0:
+                  operator: falsy
+                  arg0:
+                    prop: sendemail
+                arg1:
+                  operator: falsy
+                  arg0:
+                    prop: optionquiet
+              errorData: _("The 'Send email' and 'Quiet' options are mutually exclusive.")
       - type: checkbox
         name: optionquiet
         label: _("Quiet")
         hint: _("Suppress non-error messages.")
         value: false
+        validators:
+          custom:
+            - constraint:
+                operator: or
+                arg0:
+                  operator: falsy
+                  arg0:
+                    prop: sendemail
+                arg1:
+                  operator: falsy
+                  arg0:
+                    prop: optionquiet
+              errorData: _("The 'Send email' and 'Quiet' options are mutually exclusive.")
       - type: checkbox
         name: optionarchive
         label: _("Archive")