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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 754CFB9BAB for ; Tue, 12 Dec 2023 09:51:18 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 566873103C for ; Tue, 12 Dec 2023 09:50:48 +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 ; Tue, 12 Dec 2023 09:50:47 +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 6775F45EF4 for ; Tue, 12 Dec 2023 09:50:47 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Tue, 12 Dec 2023 09:50:42 +0100 Message-Id: <20231212085042.51082-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.005 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 v2] 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: Tue, 12 Dec 2023 08:51:18 -0000 In the GUI, when a sendmail/smtp target is edited and either 'Additional Recipients' or 'Recipients' is completely removed (only possible if the other field contains a value), parameter deletion did not work properly. After applying the changes, the old value would still be in place. The changes in this patch check if the field is empty and add an appropriate 'delete' to the PUT request. This error occurred because both fields were moved to a separate panel at some point (regular Panel instead of InputPanel, to avoid double-collection values on submit). Signed-off-by: Lukas Wagner Tested-by: Maximiliano Sandoval --- 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