diff --git a/src/server/email_notifications.rs b/src/server/email_notifications.rs index 560b48a8..b3298cf9 100644 --- a/src/server/email_notifications.rs +++ b/src/server/email_notifications.rs @@ -425,13 +425,9 @@ pub fn send_prune_status( (None, _) => return Ok(()), }; - match notify.prune { - None => { /* send notifications by default */ } - Some(notify) => { - if notify == Notify::Never || (result.is_ok() && notify == Notify::Error) { - return Ok(()); - } - } + let notify_prune = notify.prune.unwrap_or(Notify::Error); + if notify_prune == Notify::Never || (result.is_ok() && notify_prune == Notify::Error) { + return Ok(()); } let (fqdn, port) = get_server_url(); diff --git a/www/window/NotifyOptions.js b/www/window/NotifyOptions.js index 7c7e6489..11765b43 100644 --- a/www/window/NotifyOptions.js +++ b/www/window/NotifyOptions.js @@ -10,6 +10,18 @@ Ext.define('PBS.form.NotifyType', { ], }); +Ext.define('PBS.form.NotifyErrorDefaultType', { + extend: 'Proxmox.form.KVComboBox', + alias: 'widget.pbsNotifyErrorDefaultType', + + comboItems: [ + ['__default__', gettext('Default (Errors)')], + ['always', gettext('Always')], + ['error', gettext('Errors')], + ['never', gettext('Never')], + ], +}); + Ext.define('PBS.window.NotifyOptions', { extend: 'Proxmox.window.Edit', xtype: 'pbsNotifyOptionEdit', @@ -73,7 +85,7 @@ Ext.define('PBS.window.NotifyOptions', { deleteEmpty: false, }, { - xtype: 'pbsNotifyType', + xtype: 'pbsNotifyErrorDefaultType', name: 'prune', fieldLabel: gettext('Prune Jobs'), value: '__default__',