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 CA079B3A02 for ; Wed, 29 Nov 2023 13:18:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AD5F862C8 for ; Wed, 29 Nov 2023 13:18:19 +0100 (CET) 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 ; Wed, 29 Nov 2023 13:18:18 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6B9B540927 for ; Wed, 29 Nov 2023 13:18:18 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Wed, 29 Nov 2023 13:18:12 +0100 Message-Id: <20231129121812.145409-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.008 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 widget-toolkit] notify: sendmail: smtp: fix mailto/mailto-user parameter deletion 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: Wed, 29 Nov 2023 12:18:19 -0000 Both fields were moved to a separate panel at some point, but this broke parameter deletion behavior (e.g. if a target is modified and switches from using mailto to mailto-user, then mailto should be deleted) Signed-off-by: Lukas Wagner --- src/panel/SendmailEditPanel.js | 7 +++++++ src/panel/SmtpEditPanel.js | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/src/panel/SendmailEditPanel.js b/src/panel/SendmailEditPanel.js index 5a154c1..f943fa4 100644 --- a/src/panel/SendmailEditPanel.js +++ b/src/panel/SendmailEditPanel.js @@ -97,7 +97,14 @@ Ext.define('Proxmox.panel.SendmailEditPanel', { if (values.mailto) { values.mailto = values.mailto.split(/[\s,;]+/); + } else if (!me.isCreate) { + Proxmox.Utils.assemble_field_data(values, { 'delete': 'mailto' }); } + + if (!values['mailto-user'] && !me.isCreate) { + Proxmox.Utils.assemble_field_data(values, { 'delete': 'mailto-user' }); + } + return values; }, }); diff --git a/src/panel/SmtpEditPanel.js b/src/panel/SmtpEditPanel.js index 8b258e0..128f1e3 100644 --- a/src/panel/SmtpEditPanel.js +++ b/src/panel/SmtpEditPanel.js @@ -173,6 +173,12 @@ Ext.define('Proxmox.panel.SmtpEditPanel', { if (values.mailto) { values.mailto = values.mailto.split(/[\s,;]+/); + } else if (!me.isCreate) { + Proxmox.Utils.assemble_field_data(values, { 'delete': 'mailto' }); + } + + if (!values['mailto-user'] && !me.isCreate) { + Proxmox.Utils.assemble_field_data(values, { 'delete': 'mailto-user' }); } if (!values.authentication && !me.isCreate) { -- 2.39.2