From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH widget-toolkit v2] notify: sendmail: smtp: fix mailto/mailto-user parameter deletion
Date: Tue, 12 Dec 2023 09:50:42 +0100 [thread overview]
Message-ID: <20231212085042.51082-1-l.wagner@proxmox.com> (raw)
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 <l.wagner@proxmox.com>
Tested-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
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
next reply other threads:[~2023-12-12 8:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-12 8:50 Lukas Wagner [this message]
2024-01-04 12:41 ` Fiona Ebner
2024-01-04 13:01 ` Lukas Wagner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231212085042.51082-1-l.wagner@proxmox.com \
--to=l.wagner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox