From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id B02E01FF176
for <inbox@lore.proxmox.com>; Fri, 7 Mar 2025 10:26:28 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 6ECF016A42;
Fri, 7 Mar 2025 10:26:15 +0100 (CET)
From: Markus Frank <m.frank@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 7 Mar 2025 10:25:45 +0100
Message-Id: <20250307092546.102655-4-m.frank@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250307092546.102655-1-m.frank@proxmox.com>
References: <20250307092546.102655-1-m.frank@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -1.311 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
ENA_SUBJ_ODD_CASE 2.6 Subject has odd case
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
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 v3 3/4] ui: add
hideFormatWhenStorageEmpty option to DiskStorageSelector
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>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
Prerequisite for "ui: restore window: add diskformat option"
The hide condition is copied from the format selector item in the same
file.
Signed-off-by: Markus Frank <m.frank@proxmox.com>
---
v3:
* added (me.hideFormatWhenStorageEmpty && !me.autoSelect) to the hide
condition in initComponent instead of manually hiding it in the next
patch (4/4).
www/manager6/form/DiskStorageSelector.js | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/www/manager6/form/DiskStorageSelector.js b/www/manager6/form/DiskStorageSelector.js
index 0ef48f51..37cb8b4b 100644
--- a/www/manager6/form/DiskStorageSelector.js
+++ b/www/manager6/form/DiskStorageSelector.js
@@ -30,6 +30,7 @@ Ext.define('PVE.form.DiskStorageSelector', {
// hides the format field (e.g. for TPM state)
hideFormat: false,
+ hideFormatWhenStorageEmpty: false,
// sets the initial size value
// string because else we get a type confusion
@@ -47,6 +48,9 @@ Ext.define('PVE.form.DiskStorageSelector', {
hdfilesel.setVisible(false);
formatsel.setDisabled(true);
+ if (me.hideFormatWhenStorageEmpty) {
+ formatsel.setVisible(false);
+ }
return;
}
@@ -73,6 +77,11 @@ Ext.define('PVE.form.DiskStorageSelector', {
var select = !!rec.data.select_existing && !me.hideSelection;
+ // This is needed to make the format selector visible
+ // after it has been hidden because of hideFormatWhenStorageEmpty.
+ let hideFormatCondition = me.hideFormat || me.storageContent === 'rootdir';
+ formatsel.setVisible(!hideFormatCondition);
+
formatsel.setDisabled(me.hideFormat || Ext.Object.getSize(validFormats) <= 1);
formatsel.setValue(selectFormat);
@@ -161,7 +170,8 @@ Ext.define('PVE.form.DiskStorageSelector', {
fieldLabel: gettext('Format'),
nodename: me.nodename,
disabled: true,
- hidden: me.hideFormat || me.storageContent === 'rootdir',
+ hidden: me.hideFormat || me.storageContent === 'rootdir'
+ || (me.hideFormatWhenStorageEmpty && !me.autoSelect),
value: 'qcow2',
allowBlank: false,
},
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel