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 <l.wag...@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



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

Reply via email to