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 75E2DA267D for ; Mon, 19 Jun 2023 11:14:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 58CF126DDF 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 76C96468DC 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:32 +0200 Message-Id: <20230619091334.1715659-3-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 3/5] ui: multi pci selector: indent functions multifunction devices 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:14:06 -0000 when there is more than one function for a device, indent the individual functions. This sets them visually apart from the 'pass all through as one' entry We have to use a html entity here, as extjs trims the normal whitespace. Signed-off-by: Dominik Csapak --- www/manager6/form/MultiPCISelector.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/www/manager6/form/MultiPCISelector.js b/www/manager6/form/MultiPCISelector.js index 97241bb0..e1ef691a 100644 --- a/www/manager6/form/MultiPCISelector.js +++ b/www/manager6/form/MultiPCISelector.js @@ -128,16 +128,17 @@ Ext.define('PVE.form.MultiPCISelector', { let slots = {}; records.forEach((rec) => { let slotname = rec.data.id.slice(0, -2); // remove function - rec.set('slot', slotname); if (slots[slotname] !== undefined) { slots[slotname].count++; + rec.set('slot', slots[slotname]); return; } - slots[slotname] = { count: 1, }; + rec.set('slot', slots[slotname]); + if (rec.data.id.endsWith('.0')) { slots[slotname].device = rec.data; } @@ -213,6 +214,12 @@ Ext.define('PVE.form.MultiPCISelector', { { header: 'ID', dataIndex: 'id', + renderer: function(value, _md, rec) { + if (value.match(/\.[0-9a-f]/i) && rec.data.slot?.count > 1) { + return ` ${value}`; + } + return value; + }, width: 150, }, { -- 2.30.2