From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D1881DDD1 for ; Mon, 17 Jul 2023 17:02:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7177BFBE3 for ; Mon, 17 Jul 2023 17:01:30 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 17 Jul 2023 17:01:26 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4BD0E42B8D for ; Mon, 17 Jul 2023 17:01:24 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Mon, 17 Jul 2023 17:00:41 +0200 Message-Id: <20230717150051.710464-57-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230717150051.710464-1-l.wagner@proxmox.com> References: <20230717150051.710464-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.120 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v3 pve-manager 56/66] ui: backup: allow to set notification-target for one-off backups X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jul 2023 15:02:04 -0000 In essence the same change as for backup jobs. Signed-off-by: Lukas Wagner --- www/manager6/window/Backup.js | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/www/manager6/window/Backup.js b/www/manager6/window/Backup.js index 4b21c746..17a37e12 100644 --- a/www/manager6/window/Backup.js +++ b/www/manager6/window/Backup.js @@ -30,12 +30,32 @@ Ext.define('PVE.window.Backup', { name: 'mode', }); + let notificationTargetSelector = Ext.create('PVE.form.NotificationTargetSelector', { + fieldLabel: gettext('Notification target'), + name: 'notification-target', + emptyText: Proxmox.Utils.noneText, + hidden: true, + }); + let mailtoField = Ext.create('Ext.form.field.Text', { fieldLabel: gettext('Send email to'), name: 'mailto', emptyText: Proxmox.Utils.noneText, }); + let notificationModeSelector = Ext.create('PVE.form.NotificationModeSelector', { + fieldLabel: gettext('Notify via'), + value: 'mailto', + name: 'notification-mode', + listeners: { + change: function(f, v) { + let mailSelected = v === 'mailto'; + notificationTargetSelector.setHidden(mailSelected); + mailtoField.setHidden(!mailSelected); + }, + }, + }); + const keepNames = [ ['keep-last', gettext('Keep Last')], ['keep-hourly', gettext('Keep Hourly')], @@ -107,6 +127,12 @@ Ext.define('PVE.window.Backup', { success: function(response, opts) { const data = response.result.data; + if (!initialDefaults && data['notification-mode'] !== undefined) { + notificationModeSelector.setValue(data['notification-mode']); + } + if (!initialDefaults && data['notification-channel'] !== undefined) { + notificationTargetSelector.setValue(data['notification-channel']); + } if (!initialDefaults && data.mailto !== undefined) { mailtoField.setValue(data.mailto); } @@ -176,6 +202,8 @@ Ext.define('PVE.window.Backup', { ], column2: [ compressionSelector, + notificationModeSelector, + notificationTargetSelector, mailtoField, removeCheckbox, ], @@ -252,10 +280,15 @@ Ext.define('PVE.window.Backup', { remove: values.remove, }; - if (values.mailto) { + if (values.mailto && values['notification-mode'] === 'mailto') { params.mailto = values.mailto; } + if (values['notification-target'] && + values['notification-mode'] === 'notification-target') { + params['notification-target'] = values['notification-target']; + } + if (values.compress) { params.compress = values.compress; } -- 2.39.2