[pve-devel] [PATCH manager v7 10/14] ui: tree/ResourceTree: show Tags in tree

[Aaron Lauterer]

Why the change from vm.text to vm_text in {lxc,qemu}/Config.js?

AFAICT we have exactly the same string in the now not used "vm.text".

If these changes are needed and should be part of this commmit, a short 
explanation would be good as it does not seem to have anything to do with the 
resource tree.

On 6/21/22 11:20, Dominik Csapak wrote:
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
>   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;
>       },
>