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 552769B6D for ; Fri, 18 Nov 2022 12:59:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3E7221812 for ; Fri, 18 Nov 2022 12:59:21 +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, 18 Nov 2022 12:59:20 +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 BB9E944D6A for ; Fri, 18 Nov 2022 12:59:19 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 18 Nov 2022 12:59:15 +0100 Message-Id: <20221118115919.2477011-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.065 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=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 =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager 1/4] ui: hide 'no tags' field and edit icon without VM.Config.Options 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: Fri, 18 Nov 2022 11:59:21 -0000 they cannot edit them anyway, so no point in showing them that there is no tag Signed-off-by: Dominik Csapak --- www/manager6/form/TagEdit.js | 12 ++++++++++-- www/manager6/lxc/Config.js | 1 + www/manager6/qemu/Config.js | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/www/manager6/form/TagEdit.js b/www/manager6/form/TagEdit.js index d4428e029..23b75acc7 100644 --- a/www/manager6/form/TagEdit.js +++ b/www/manager6/form/TagEdit.js @@ -7,6 +7,9 @@ Ext.define('PVE.panel.TagEditContainer', { align: 'middle', }, + // set to false to hide the 'no tags' field and the edit button + canEdit: true, + controller: { xclass: 'Ext.app.ViewController', @@ -241,6 +244,7 @@ Ext.define('PVE.panel.TagEditContainer', { if (view.tags) { me.loadTags(view.tags); } + me.getViewModel().set('canEdit', view.canEdit); me.mon(Ext.GlobalEvents, 'loadedUiOptions', () => { view.toggleCls('hide-handles', PVE.Utils.shouldSortTags()); @@ -253,11 +257,15 @@ Ext.define('PVE.panel.TagEditContainer', { data: { tagCount: 0, editMode: false, + canEdit: true, }, formulas: { hideNoTags: function(get) { - return get('tagCount') !== 0; + return get('tagCount') !== 0 || !get('canEdit'); + }, + hideEditBtn: function(get) { + return get('editMode') || !get('canEdit'); }, }, }, @@ -326,7 +334,7 @@ Ext.define('PVE.panel.TagEditContainer', { cls: 'pve-tag-inline-button', html: ``, bind: { - hidden: '{editMode}', + hidden: '{hideEditBtn}', }, listeners: { click: 'editClick', diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js index f33390513..23c17d2ea 100644 --- a/www/manager6/lxc/Config.js +++ b/www/manager6/lxc/Config.js @@ -186,6 +186,7 @@ Ext.define('PVE.lxc.Config', { let tagsContainer = Ext.create('PVE.panel.TagEditContainer', { tags: vm.tags, + canEdit: !!caps.vms['VM.Config.Options'], listeners: { change: function(tags) { Proxmox.Utils.API2Request({ diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js index 5c8fa620d..94c540c59 100644 --- a/www/manager6/qemu/Config.js +++ b/www/manager6/qemu/Config.js @@ -222,6 +222,7 @@ Ext.define('PVE.qemu.Config', { let tagsContainer = Ext.create('PVE.panel.TagEditContainer', { tags: vm.tags, + canEdit: !!caps.vms['VM.Config.Options'], listeners: { change: function(tags) { Proxmox.Utils.API2Request({ -- 2.30.2