From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 4EB7A1FF163 for ; Mon, 6 Oct 2025 13:24:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 47F4C1F39; Mon, 6 Oct 2025 13:24:14 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 6 Oct 2025 13:24:04 +0200 Message-ID: <20251006112409.2141871-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251006112409.2141871-1-d.csapak@proxmox.com> References: <20251006112409.2141871-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 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 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 1/1] ui: disk storage selector: use new api return format 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" since that will be used in the future. For compatibility with older nodes, keep the old logic around. No functional change intended. Signed-off-by: Dominik Csapak --- www/manager6/form/DiskStorageSelector.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/www/manager6/form/DiskStorageSelector.js b/www/manager6/form/DiskStorageSelector.js index ec22ef58..edfdfad4 100644 --- a/www/manager6/form/DiskStorageSelector.js +++ b/www/manager6/form/DiskStorageSelector.js @@ -58,16 +58,28 @@ Ext.define('PVE.form.DiskStorageSelector', { } let validFormats = {}; - let selectFormat = 'raw'; - if (rec.data.format) { - validFormats = rec.data.format[0]; // 0 is the formats, 1 the default in the backend + let defaultFormat = 'raw'; + let selectFormat = defaultFormat; + if (rec.data.formats) { + for (const format of rec.data.formats.supported) { + validFormats[format] = true; + } + defaultFormat = rec.data.formats.default; + } else if (rec.data.format) { + // legacy api, just for compatibility + // 0 is the formats, 1 the default in the backend + validFormats = rec.data.format[0]; + defaultFormat = rec.data.format[1]; + } + + if (Object.keys(validFormats).length > 0) { delete validFormats.subvol; // we never need subvol in the gui if (validFormats.qcow2) { selectFormat = 'qcow2'; } else if (validFormats.raw) { selectFormat = 'raw'; } else { - selectFormat = rec.data.format[1]; + selectFormat = defaultFormat; } } -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel