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 ACB261FF2AB for ; Wed, 17 Jul 2024 14:49:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 58E863B89A; Wed, 17 Jul 2024 14:50:22 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Wed, 17 Jul 2024 14:49:51 +0200 Message-ID: <20240717124952.1027784-2-c.heiss@proxmox.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240717124952.1027784-1-c.heiss@proxmox.com> References: <20240717124952.1027784-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 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 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 2/2] www: utils: fix inconsistency in host cpu usage display in search view 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Between the number of CPUs and the actual label, a space was missing - resulting in an inconsistency vs. the "CPU usage" column. Signed-off-by: Christoph Heiss --- www/manager6/Utils.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index ddef11bb1..6a0ecc98f 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1078,8 +1078,9 @@ Ext.define('PVE.Utils', { } var per = (record.data.cpu/maxcpu) * record.data.maxcpu * 100; + const cpu_label = maxcpu > 1 ? 'CPUs' : 'CPU'; - return per.toFixed(1) + '% of ' + maxcpu.toString() + (maxcpu > 1 ? 'CPUs' : 'CPU'); + return `${per.toFixed(1)}% of ${maxcpu} ${cpu_label}`; }, render_bandwidth: function(value) { -- 2.45.1 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel