From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 1/4] ui: hide 'no tags' field and edit icon without VM.Config.Options
Date: Fri, 18 Nov 2022 12:59:15 +0100 [thread overview]
Message-ID: <20221118115919.2477011-1-d.csapak@proxmox.com> (raw)
they cannot edit them anyway, so no point in showing them that
there is no tag
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
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: `<i data-qtip="${gettext('Edit Tags')}" class="fa fa-pencil"></i>`,
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
next reply other threads:[~2022-11-18 11:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-18 11:59 Dominik Csapak [this message]
2022-11-18 11:59 ` [pve-devel] [PATCH manager 2/4] ui: tags: shortcut accept&cancel with keypresses Dominik Csapak
2022-11-18 11:59 ` [pve-devel] [PATCH manager 3/4] ui: tags: implement dirty tracking for inline editing Dominik Csapak
2022-11-18 11:59 ` [pve-devel] [PATCH manager 4/4] ui: tags: highlight finish inline editing button Dominik Csapak
2022-11-18 15:40 ` [pve-devel] applied-series: [PATCH manager 1/4] ui: hide 'no tags' field and edit icon without VM.Config.Options Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221118115919.2477011-1-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox