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 5425396BF7 for ; Fri, 1 Mar 2024 10:03:46 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 39CBE1ED3E for ; Fri, 1 Mar 2024 10:03:46 +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 ; Fri, 1 Mar 2024 10:03:41 +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 B1E1E4829F for ; Fri, 1 Mar 2024 10:03:41 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 1 Mar 2024 10:03:40 +0100 Message-Id: <20240301090341.1342682-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240301090341.1342682-1-d.csapak@proxmox.com> References: <20240301090341.1342682-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.019 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: [pbs-devel] [PATCH widget-toolkit 1/1] dns: optionally send delete for optional values X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Mar 2024 09:03:46 -0000 pbs only deletes the optional values here when they are sent with the 'delete' parameter, in contrast to pve/pmg that don't have a delete parameter currently and always use the parameters as source of truth. So to handle that, optionally set deleteEmpty if set from outside Signed-off-by: Dominik Csapak --- src/node/DNSEdit.js | 6 ++++++ src/node/DNSView.js | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/node/DNSEdit.js b/src/node/DNSEdit.js index 0b1135e..c895d9b 100644 --- a/src/node/DNSEdit.js +++ b/src/node/DNSEdit.js @@ -2,6 +2,9 @@ Ext.define('Proxmox.node.DNSEdit', { extend: 'Proxmox.window.Edit', alias: ['widget.proxmoxNodeDNSEdit'], + // pbs needs this set to true + deleteEmpty: false, + initComponent: function() { let me = this; @@ -21,6 +24,7 @@ Ext.define('Proxmox.node.DNSEdit', { fieldLabel: gettext('DNS server') + " 1", vtype: 'IP64Address', skipEmptyText: true, + deleteEmpty: me.deleteEmpty, name: 'dns1', }, { @@ -28,6 +32,7 @@ Ext.define('Proxmox.node.DNSEdit', { fieldLabel: gettext('DNS server') + " 2", vtype: 'IP64Address', skipEmptyText: true, + deleteEmpty: me.deleteEmpty, name: 'dns2', }, { @@ -35,6 +40,7 @@ Ext.define('Proxmox.node.DNSEdit', { fieldLabel: gettext('DNS server') + " 3", vtype: 'IP64Address', skipEmptyText: true, + deleteEmpty: me.deleteEmpty, name: 'dns3', }, ]; diff --git a/src/node/DNSView.js b/src/node/DNSView.js index 4782f9c..b57da85 100644 --- a/src/node/DNSView.js +++ b/src/node/DNSView.js @@ -2,6 +2,9 @@ Ext.define('Proxmox.node.DNSView', { extend: 'Proxmox.grid.ObjectGrid', alias: ['widget.proxmoxNodeDNSView'], + // pbs needs this set to true + deleteEmpty: false, + initComponent: function() { let me = this; @@ -12,6 +15,7 @@ Ext.define('Proxmox.node.DNSView', { let run_editor = () => Ext.create('Proxmox.node.DNSEdit', { autoShow: true, nodename: me.nodename, + deleteEmpty: me.deleteEmpty, }); Ext.apply(me, { -- 2.30.2