[pve-devel] [PATCH manager 2/2] ui: backup job details: show notification-mode instead of legacy keys

[Lukas Wagner <l.wagner@proxmox.com>]

The backup job details view was never updated after the overhaul of the
notification system. In this commit we remove the left-over
notification-policy/target handling and change the view so that we
display the current configuration based on notification-mode, mailto and
mailnotification.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
Only intended for PVE 9.

 www/manager6/dc/BackupJobDetail.js | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/www/manager6/dc/BackupJobDetail.js b/www/manager6/dc/BackupJobDetail.js
index 85bb036a..f80d5ef7 100644
--- a/www/manager6/dc/BackupJobDetail.js
+++ b/www/manager6/dc/BackupJobDetail.js
@@ -202,27 +202,27 @@ Ext.define('PVE.dc.BackupInfo', {
     column2: [
 	{
 	    xtype: 'displayfield',
-	    name: 'notification-policy',
+	    name: 'notification-mode',
 	    fieldLabel: gettext('Notification'),
 	    renderer: function(value) {
+		value = value ?? 'auto';
 		let record = this.up('pveBackupInfo')?.record;
+		let mailto = record?.mailto;
+		let mailnotification = record?.mailnotification ?? 'always';
 
-		// Fall back to old value, in case this option is not migrated yet.
-		let policy = value || record?.mailnotification || 'always';
+		if ((value === 'auto' && mailto === undefined) || value === 'notification-system') {
+		    return gettext('Use global notification settings');
+		} else {
+		    if (mailto === undefined) {
+			mailto = '-';
+		    }
 
-		let when = gettext('Always');
-		if (policy === 'failure') {
-		    when = gettext('On failure only');
-		} else if (policy === 'never') {
-		    when = gettext('Never');
+		    if (mailnotification === 'always') {
+			return Ext.String.format(gettext('Always use sendmail to send an email to: {0}'), mailto);
+		    } else {
+			return Ext.String.format(gettext('On failure, use sendmail to send an email to: {0}'), mailto);
+		    }
 		}
-
-		// Notification-target takes precedence
-		let target = record?.['notification-target'] ||
-		    record?.mailto ||
-		    gettext('No target configured');
-
-		return `${when} (${target})`;
 	    },
 	},
 	{
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel