From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <f.ebner@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 C7E16AF45
 for <pve-devel@lists.proxmox.com>; Wed,  6 Apr 2022 10:05:15 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 6FF10272BB
 for <pve-devel@lists.proxmox.com>; Wed,  6 Apr 2022 10:04:43 +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 13D0227160
 for <pve-devel@lists.proxmox.com>; Wed,  6 Apr 2022 10:04:39 +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 DFF314282D
 for <pve-devel@lists.proxmox.com>; Wed,  6 Apr 2022 10:04:38 +0200 (CEST)
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed,  6 Apr 2022 10:04:08 +0200
Message-Id: <20220406080416.66227-12-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.111 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 11/19] ui: multi disk edit: allow
 setting config ID when adding disk
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: Wed, 06 Apr 2022 08:05:15 -0000

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
 www/manager6/panel/MultiDiskEdit.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/www/manager6/panel/MultiDiskEdit.js b/www/manager6/panel/MultiDiskEdit.js
index c1fd0617..7ba8246a 100644
--- a/www/manager6/panel/MultiDiskEdit.js
+++ b/www/manager6/panel/MultiDiskEdit.js
@@ -34,26 +34,35 @@ Ext.define('PVE.panel.MultiDiskPanel', {
 	// define in subclass
 	diskSorter: undefined,
 
-	addDisk: function() {
+	addDisk: function(confid) {
 	    let me = this;
 	    let grid = me.lookup('grid');
 	    let store = grid.getStore();
 
 	    // get free disk id
 	    let vmconfig = me.getVMConfig(true);
-	    let nextFreeDisk = me.getNextFreeDisk(vmconfig);
-	    if (!nextFreeDisk) {
+
+	    if (!confid) {
+		let nextFreeDisk = me.getNextFreeDisk(vmconfig);
+		if (!nextFreeDisk) {
+		    return;
+		}
+		confid = nextFreeDisk.confid;
+	    }
+
+	    if (store.findRecord('name', confid, 0, false, true, true) !== null) {
+		console.warn(`multi disk panel - disk for ${confid} already defined!`);
 		return;
 	    }
 
 	    // add store entry + panel
 	    let itemId = 'disk-card-' + ++Ext.idSeed;
 	    let rec = store.add({
-		name: nextFreeDisk.confid,
+		name: confid,
 		itemId,
 	    })[0];
 
-	    let panel = me.addPanel(itemId, vmconfig, nextFreeDisk.confid);
+	    let panel = me.addPanel(itemId, vmconfig, confid);
 	    panel.updateVMConfig(vmconfig);
 
 	    // we need to setup a validitychange handler, so that we can show
-- 
2.30.2