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 D476FA2667 for ; Mon, 19 Jun 2023 11:13:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BDC8126DE2 for ; Mon, 19 Jun 2023 11:13:36 +0200 (CEST) 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 ; Mon, 19 Jun 2023 11:13:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 99438468D5 for ; Mon, 19 Jun 2023 11:13:35 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 19 Jun 2023 11:13:33 +0200 Message-Id: <20230619091334.1715659-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230619091334.1715659-1-d.csapak@proxmox.com> References: <20230619091334.1715659-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 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 manager 4/5] ui: pci map edit: make top fields more clear 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: Mon, 19 Jun 2023 09:13:36 -0000 by * moving the node to the left column and changing the label * moving the mdev filter to the right column * show only the create button for new node mappings (otherwise we'd have a reset button here that cannot do anything useful) Signed-off-by: Dominik Csapak --- www/manager6/window/PCIMapEdit.js | 38 +++++++++++++++++-------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/www/manager6/window/PCIMapEdit.js b/www/manager6/window/PCIMapEdit.js index 0b6d7d60..516678e0 100644 --- a/www/manager6/window/PCIMapEdit.js +++ b/www/manager6/window/PCIMapEdit.js @@ -13,8 +13,8 @@ Ext.define('PVE.window.PCIMapEditWindow', { cbindData: function(initialConfig) { let me = this; - me.isCreate = !me.name; - me.method = me.isCreate ? 'POST' : 'PUT'; + me.isCreate = !me.name || !me.nodename; + me.method = me.name ? 'PUT' : 'POST'; return { name: me.name, nodename: me.nodename, @@ -23,7 +23,7 @@ Ext.define('PVE.window.PCIMapEditWindow', { submitUrl: function(_url, data) { let me = this; - let name = me.isCreate ? '' : me.name; + let name = me.method === 'PUT' ? me.name : ''; return `/cluster/mapping/pci/${name}`; }, @@ -155,22 +155,9 @@ Ext.define('PVE.window.PCIMapEditWindow', { name: 'id', allowBlank: false, }, - { - xtype: 'proxmoxcheckbox', - fieldLabel: gettext('Mediated Devices'), - labelWidth: 120, - reference: 'mdev', - name: 'mdev', - cbind: { - deleteEmpty: '{!isCreate}', - }, - }, - ], - - column2: [ { xtype: 'pmxDisplayEditField', - fieldLabel: gettext('Node'), + fieldLabel: gettext('Mapping on Node'), labelWidth: 120, name: 'node', editConfig: { @@ -184,6 +171,23 @@ Ext.define('PVE.window.PCIMapEditWindow', { }, ], + column2: [ + { + // as spacer + xtype: 'displayfield', + }, + { + xtype: 'proxmoxcheckbox', + fieldLabel: gettext('Mediated Devices'), + labelWidth: 120, + reference: 'mdev', + name: 'mdev', + cbind: { + deleteEmpty: '{!isCreate}', + }, + }, + ], + columnB: [ { xtype: 'pveMultiPCISelector', -- 2.30.2