From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <a.lauterer@proxmox.com>
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 7BDB1AA61
for <pve-devel@lists.proxmox.com>; Tue, 5 Apr 2022 14:31:03 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 542DB20B1B
for <pve-devel@lists.proxmox.com>; Tue, 5 Apr 2022 14:30:33 +0200 (CEST)
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 C4C1220B09
for <pve-devel@lists.proxmox.com>; Tue, 5 Apr 2022 14:30:32 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 11B59459CA
for <pve-devel@lists.proxmox.com>; Tue, 5 Apr 2022 14:30:32 +0200 (CEST)
From: Aaron Lauterer <a.lauterer@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 5 Apr 2022 14:30:12 +0200
Message-Id: <20220405123016.2911726-2-a.lauterer@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20220405123016.2911726-1-a.lauterer@proxmox.com>
References: <20220405123016.2911726-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 v6 manager 1/5] ui: utils: 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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 05 Apr 2022 12:31:03 -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 <a.lauterer@proxmox.com>
---
changes since:
v4: moved at the start of the series to avoid unnecessary steps
www/manager6/Utils.js | 4 ++--
www/manager6/lxc/MPEdit.js | 2 +-
www/manager6/lxc/MultiMPEdit.js | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 735806aa..3351e53b 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1575,12 +1575,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;
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 = {
--
2.30.2