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 D0AE869B42 for ; Mon, 14 Mar 2022 10:35:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CEE46E4F for ; Mon, 14 Mar 2022 10:35:12 +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 id 83E1DE2E for ; Mon, 14 Mar 2022 10:35:11 +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 521F1463AE for ; Mon, 14 Mar 2022 10:35:11 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Mon, 14 Mar 2022 10:35:09 +0100 Message-Id: <20220314093509.349554-7-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220314093509.349554-1-a.lauterer@proxmox.com> References: <20220314093509.349554-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.025 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v4 manager 6/6] ui: util: refactor mps to mp 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: Mon, 14 Mar 2022 09:35:12 -0000 Using the actual config key instead of the pluralization, makes it easier in the situations where we need to match against it. Signed-off-by: Aaron Lauterer --- www/manager6/Utils.js | 8 +++----- www/manager6/lxc/MPEdit.js | 2 +- www/manager6/lxc/MultiMPEdit.js | 4 ++-- www/manager6/qemu/HDReassign.js | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 5190f750..519faac5 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1578,12 +1578,12 @@ Ext.define('PVE.Utils', { }, mp_counts: { - mps: 256, + mp: 256, unused: 256, }, forEachMP: function(func, includeUnused) { - for (let i = 0; i < PVE.Utils.mp_counts.mps; i++) { + for (let i = 0; i < PVE.Utils.mp_counts.mp; i++) { let cont = func('mp', i); if (!cont && cont !== undefined) { return; @@ -1805,9 +1805,7 @@ Ext.define('PVE.Utils', { }, nextFreeMP: function(type, config) { - let mptype = type === "mp" ? "mps" : type; - - for (let i = 0; i < PVE.Utils.mp_counts[mptype]; i++) { + for (let i = 0; i < PVE.Utils.mp_counts[type]; i++) { let confid = `${type}${i}`; if (!Ext.isDefined(config[confid])) { return { diff --git a/www/manager6/lxc/MPEdit.js b/www/manager6/lxc/MPEdit.js index b8c6b6cb..609447ef 100644 --- a/www/manager6/lxc/MPEdit.js +++ b/www/manager6/lxc/MPEdit.js @@ -194,7 +194,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', { name: 'mpid', fieldLabel: gettext('Mount Point ID'), minValue: 0, - maxValue: PVE.Utils.mp_counts.mps - 1, + maxValue: PVE.Utils.mp_counts.mp - 1, hidden: true, allowBlank: false, disabled: true, diff --git a/www/manager6/lxc/MultiMPEdit.js b/www/manager6/lxc/MultiMPEdit.js index 709dacb1..36cee4ff 100644 --- a/www/manager6/lxc/MultiMPEdit.js +++ b/www/manager6/lxc/MultiMPEdit.js @@ -8,7 +8,7 @@ Ext.define('PVE.lxc.MultiMPPanel', { xclass: 'Ext.app.ViewController', // count of mps + rootfs - maxCount: PVE.Utils.mp_counts.mps + 1, + maxCount: PVE.Utils.mp_counts.mp + 1, getNextFreeDisk: function(vmconfig) { let nextFreeDisk; @@ -17,7 +17,7 @@ Ext.define('PVE.lxc.MultiMPPanel', { confid: 'rootfs', }; } else { - for (let i = 0; i < PVE.Utils.mp_counts.mps; i++) { + for (let i = 0; i < PVE.Utils.mp_counts.mp; i++) { let confid = `mp${i}`; if (!vmconfig[confid]) { nextFreeDisk = { diff --git a/www/manager6/qemu/HDReassign.js b/www/manager6/qemu/HDReassign.js index b6c67964..ef04a8cf 100644 --- a/www/manager6/qemu/HDReassign.js +++ b/www/manager6/qemu/HDReassign.js @@ -17,7 +17,7 @@ Ext.define('PVE.window.HDReassign', { }, formulas: { mpMaxCount: get => get('mpType') === 'mp' - ? PVE.Utils.mp_counts.mps - 1 + ? PVE.Utils.mp_counts.mp - 1 : PVE.Utils.mp_counts.unused - 1, }, }, -- 2.30.2