From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 9D0DE1FF14C for ; Fri, 29 May 2026 16:00:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D9B8CCFC3; Fri, 29 May 2026 16:00:13 +0200 (CEST) From: Erik Fastermann To: pve-devel@lists.proxmox.com Subject: [PATCH pve-manager v3] fix #6348: ui: bulk action: use options tag style Date: Fri, 29 May 2026 15:59:37 +0200 Message-ID: <20260529135937.239385-1-e.fastermann@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.021 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Message-ID-Hash: W3OLCEBD3IIK2QS4DLCRHS62JEJOY3UY X-Message-ID-Hash: W3OLCEBD3IIK2QS4DLCRHS62JEJOY3UY X-MailFrom: efastermann@ruth.proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Erik Fastermann X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Use the tag style configured in the options for the bulk action table or the default if set to none. This improves visual consistency and makes tagged resources easier to identify at a glance. Signed-off-by: Erik Fastermann --- changes since v2: * use the default tag style if none is configured www/manager6/UIOptions.js | 16 ++++++++++++---- www/manager6/dc/OptionView.js | 4 ++-- www/manager6/form/VMSelector.js | 2 ++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/www/manager6/UIOptions.js b/www/manager6/UIOptions.js index 99b999b7..8c4674af 100644 --- a/www/manager6/UIOptions.js +++ b/www/manager6/UIOptions.js @@ -60,12 +60,20 @@ Ext.define('PVE.UIOptions', { let overrides = style?.['color-map']; PVE.UIOptions.updateTagOverrides(PVE.UIOptions.parseTagOverrides(overrides ?? '')); + Ext.ComponentQuery.query('pveResourceTree')[0].setUserCls( + PVE.UIOptions.tagStyleClass(style), + ); + Ext.ComponentQuery.query('vmselector').forEach((component) => { + component.setUserCls(PVE.UIOptions.tagStyleClass(style, true)); + }); + }, + + tagStyleClass: function (style, replaceNone = false) { let shape = style?.shape ?? 'circle'; - if (shape === '__default__') { - style = 'circle'; + if (shape === '__default__' || (shape === 'none' && replaceNone)) { + shape = 'circle'; } - - Ext.ComponentQuery.query('pveResourceTree')[0].setUserCls(`proxmox-tags-${shape}`); + return `proxmox-tags-${shape}`; }, tagTreeStyles: { diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js index da9d216b..dc12aa7e 100644 --- a/www/manager6/dc/OptionView.js +++ b/www/manager6/dc/OptionView.js @@ -393,7 +393,7 @@ Ext.define('PVE.dc.OptionView', { let colors = PVE.UIOptions.parseTagOverrides(value?.['color-map']); let shape = value.shape; let shapeText = PVE.UIOptions.tagTreeStyles[shape ?? '__default__']; - let txt = Ext.String.format(gettext('Tree Shape: {0}'), shapeText); + let txt = Ext.String.format(gettext('Shape: {0}'), shapeText); let orderText = PVE.UIOptions.tagOrderOptions[value.ordering ?? '__default__']; txt += `, ${Ext.String.format(gettext('Ordering: {0}'), orderText)}`; if (value['case-sensitive']) { @@ -457,7 +457,7 @@ Ext.define('PVE.dc.OptionView', { { name: 'shape', xtype: 'proxmoxComboGrid', - fieldLabel: gettext('Tree Shape'), + fieldLabel: gettext('Shape'), valueField: 'value', displayField: 'display', allowBlank: false, diff --git a/www/manager6/form/VMSelector.js b/www/manager6/form/VMSelector.js index 57aa73a7..a9e90b04 100644 --- a/www/manager6/form/VMSelector.js +++ b/www/manager6/form/VMSelector.js @@ -267,6 +267,8 @@ Ext.define('PVE.form.VMSelector', { me.getSelectionModel().selectAll(false); }); } + + me.userCls = PVE.UIOptions.tagStyleClass(PVE.UIOptions.options['tag-style'], true); }, }); -- 2.47.3