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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 28F5E955D7 for ; Wed, 1 Mar 2023 15:22:56 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 96FC81AED7 for ; Wed, 1 Mar 2023 15:22:25 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 1 Mar 2023 15:22:24 +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 3A86C48D6A for ; Wed, 1 Mar 2023 15:22:24 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 1 Mar 2023 15:22:19 +0100 Message-Id: <20230301142220.130986-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230301142220.130986-1-f.ebner@proxmox.com> References: <20230301142220.130986-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.003 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 Subject: [pve-devel] [PATCH manager 1/2] ui: bulk start/stop: align capability checks with backend 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: Wed, 01 Mar 2023 14:22:56 -0000 The backend requires VM.PowerMgmt, not Sys.PowerMgmt for bulk start and bulk stop. Signed-off-by: Fiona Ebner --- www/manager6/node/CmdMenu.js | 4 +++- www/manager6/node/Config.js | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/www/manager6/node/CmdMenu.js b/www/manager6/node/CmdMenu.js index 71548e9c..dc56ef08 100644 --- a/www/manager6/node/CmdMenu.js +++ b/www/manager6/node/CmdMenu.js @@ -126,9 +126,11 @@ Ext.define('PVE.node.CmdMenu', { if (!caps.vms['VM.Migrate']) { me.getComponent('bulkmigrate').setDisabled(true); } - if (!caps.nodes['Sys.PowerMgmt']) { + if (!caps.vms['VM.PowerMgmt']) { me.getComponent('bulkstart').setDisabled(true); me.getComponent('bulkstop').setDisabled(true); + } + if (!caps.nodes['Sys.PowerMgmt']) { me.getComponent('wakeonlan').setDisabled(true); } if (!caps.nodes['Sys.Console']) { diff --git a/www/manager6/node/Config.js b/www/manager6/node/Config.js index 9269e892..0cc23fb4 100644 --- a/www/manager6/node/Config.js +++ b/www/manager6/node/Config.js @@ -34,13 +34,13 @@ Ext.define('PVE.node.Config', { var actionBtn = Ext.create('Ext.Button', { text: gettext('Bulk Actions'), iconCls: 'fa fa-fw fa-ellipsis-v', - disabled: !caps.nodes['Sys.PowerMgmt'] && !caps.vms['VM.Migrate'], + disabled: !caps.vms['VM.PowerMgmt'] && !caps.vms['VM.Migrate'], menu: new Ext.menu.Menu({ items: [ { text: gettext('Bulk Start'), iconCls: 'fa fa-fw fa-play', - disabled: !caps.nodes['Sys.PowerMgmt'], + disabled: !caps.vms['VM.PowerMgmt'], handler: function() { Ext.create('PVE.window.BulkAction', { autoShow: true, @@ -54,7 +54,7 @@ Ext.define('PVE.node.Config', { { text: gettext('Bulk Shutdown'), iconCls: 'fa fa-fw fa-stop', - disabled: !caps.nodes['Sys.PowerMgmt'], + disabled: !caps.vms['VM.PowerMgmt'], handler: function() { Ext.create('PVE.window.BulkAction', { autoShow: true, -- 2.30.2