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.laute...@proxmox.com>
---
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
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
