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 438F7AECB for ; Wed, 6 Apr 2022 10:04:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DCB4A272C1 for ; Wed, 6 Apr 2022 10:04:44 +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 2D7492724C for ; Wed, 6 Apr 2022 10:04:41 +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 062164277A for ; Wed, 6 Apr 2022 10:04:41 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 6 Apr 2022 10:04:10 +0200 Message-Id: <20220406080416.66227-14-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220406080416.66227-1-f.ebner@proxmox.com> References: <20220406080416.66227-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.110 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 v10 manager 13/19] ui: multi disk edit: allow adding a disk with existing settings 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: Wed, 06 Apr 2022 08:04:47 -0000 Signed-off-by: Fabian Ebner --- www/manager6/lxc/MultiMPEdit.js | 7 ++++++- www/manager6/panel/MultiDiskEdit.js | 6 +++--- www/manager6/qemu/MultiHDEdit.js | 11 +++++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/www/manager6/lxc/MultiMPEdit.js b/www/manager6/lxc/MultiMPEdit.js index 7310ad05..15d33e15 100644 --- a/www/manager6/lxc/MultiMPEdit.js +++ b/www/manager6/lxc/MultiMPEdit.js @@ -30,8 +30,13 @@ Ext.define('PVE.lxc.MultiMPPanel', { return nextFreeDisk; }, - addPanel: function(itemId, vmconfig, confid) { + addPanel: function(itemId, vmconfig, confid, settings) { let me = this; + + if (settings) { + console.warn("MultiMPPanel - volume settings ignored"); + } + return me.getView().add({ vmconfig, border: false, diff --git a/www/manager6/panel/MultiDiskEdit.js b/www/manager6/panel/MultiDiskEdit.js index ace10eea..cdc1df42 100644 --- a/www/manager6/panel/MultiDiskEdit.js +++ b/www/manager6/panel/MultiDiskEdit.js @@ -31,14 +31,14 @@ Ext.define('PVE.panel.MultiDiskPanel', { throw "implement in subclass"; }, - addPanel: function(itemId, vmconfig, confid) { + addPanel: function(itemId, vmconfig, confid, settings) { throw "implement in subclass"; }, // define in subclass diskSorter: undefined, - addDisk: function(confid) { + addDisk: function(confid, settings) { let me = this; let grid = me.lookup('grid'); let store = grid.getStore(); @@ -66,7 +66,7 @@ Ext.define('PVE.panel.MultiDiskPanel', { itemId, })[0]; - let panel = me.addPanel(itemId, vmconfig, confid); + let panel = me.addPanel(itemId, vmconfig, confid, settings); panel.updateVMConfig(vmconfig); // we need to setup a validitychange handler, so that we can show diff --git a/www/manager6/qemu/MultiHDEdit.js b/www/manager6/qemu/MultiHDEdit.js index c981cd98..e6cc9676 100644 --- a/www/manager6/qemu/MultiHDEdit.js +++ b/www/manager6/qemu/MultiHDEdit.js @@ -16,9 +16,10 @@ Ext.define('PVE.qemu.MultiHDPanel', { return PVE.Utils.nextFreeDisk(clist, vmconfig); }, - addPanel: function(itemId, vmconfig, confid) { + addPanel: function(itemId, vmconfig, confid, settings) { let me = this; - return me.getView().add({ + + let newPanel = me.getView().add({ vmconfig, border: false, showAdvanced: Ext.state.Manager.getProvider().get('proxmox-advanced-cb'), @@ -32,6 +33,12 @@ Ext.define('PVE.qemu.MultiHDPanel', { insideWizard: true, preSelectConfid: confid, }); + + if (settings) { + newPanel.setDrive(settings); + } + + return newPanel; }, getBaseVMConfig: function() { -- 2.30.2