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 22DAD70253 for ; Tue, 21 Jun 2022 11:20:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 901092C94 for ; Tue, 21 Jun 2022 11:20:24 +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 id BAB2629D4 for ; Tue, 21 Jun 2022 11:20:15 +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 939C94378F for ; Tue, 21 Jun 2022 11:20:15 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 21 Jun 2022 11:20:08 +0200 Message-Id: <20220621092012.1776825-21-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220621092012.1776825-1-d.csapak@proxmox.com> References: <20220621092012.1776825-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.101 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [vm.name] Subject: [pve-devel] [PATCH manager v7 10/14] ui: tree/ResourceTree: show Tags in tree 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: Tue, 21 Jun 2022 09:20:44 -0000 Signed-off-by: Dominik Csapak --- www/manager6/lxc/Config.js | 4 +++- www/manager6/qemu/Config.js | 4 +++- www/manager6/tree/ResourceTree.js | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js index 9f1994d3..1b79628e 100644 --- a/www/manager6/lxc/Config.js +++ b/www/manager6/lxc/Config.js @@ -206,8 +206,10 @@ Ext.define('PVE.lxc.Config', { }, }); + let vm_text = `${vm.vmid} (${vm.name})`; + Ext.apply(me, { - title: Ext.String.format(gettext("Container {0} on node '{1}'"), vm.text, nodename), + title: Ext.String.format(gettext("Container {0} on node '{1}'"), vm_text, nodename), hstateid: 'lxctab', tbarSpacing: false, tbar: [statusTxt, tagsContainer, '->', startBtn, shutdownBtn, migrateBtn, consoleBtn, moreBtn], diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js index 2cd6d856..5c8fa620 100644 --- a/www/manager6/qemu/Config.js +++ b/www/manager6/qemu/Config.js @@ -242,8 +242,10 @@ Ext.define('PVE.qemu.Config', { }, }); + let vm_text = `${vm.vmid} (${vm.name})`; + Ext.apply(me, { - title: Ext.String.format(gettext("Virtual Machine {0} on node '{1}'"), vm.text, nodename), + title: Ext.String.format(gettext("Virtual Machine {0} on node '{1}'"), vm_text, nodename), hstateid: 'kvmtab', tbarSpacing: false, tbar: [statusTxt, tagsContainer, '->', resumeBtn, startBtn, shutdownBtn, migrateBtn, consoleBtn, moreBtn], diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js index 139defab..d41721b9 100644 --- a/www/manager6/tree/ResourceTree.js +++ b/www/manager6/tree/ResourceTree.js @@ -5,6 +5,8 @@ Ext.define('PVE.tree.ResourceTree', { extend: 'Ext.tree.TreePanel', alias: ['widget.pveResourceTree'], + userCls: 'proxmox-tags-circle', + statics: { typeDefaults: { node: { @@ -114,6 +116,8 @@ Ext.define('PVE.tree.ResourceTree', { } } + info.text += PVE.Utils.renderTags(info.tags, PVE.Utils.tagOverrides); + info.text = status + info.text; }, -- 2.30.2