From: Dominik Csapak <d.csapak@proxmox.com>
Date: Fri, 6 Apr 2018 08:22:44 +0000 (+0200)
Subject: fix editor and set_button_status for cloudinit
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ab1ee35244e3e8e3aad02357412a3d79c6ff3b01;p=pve-manager.git

fix editor and set_button_status for cloudinit

cloudinit images do not have an editor so return here
and value has to be a string to match
also set the remove button text correctly when selecting a cloudinit disk

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---

diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index 218f9059..4390e0a0 100644
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -248,7 +248,9 @@ Ext.define('PVE.qemu.HardwareView', {
 	    var editor = rowdef.editor;
 	    if (rowdef.tdCls == 'pve-itype-icon-storage') {
 		var value = me.getObjectValue(rec.data.key, '', true); 
-		if (value.match(/media=cdrom/)) {
+		if (value.match(/vm-.*-cloudinit/)) {
+		    return;
+		} else if (value.match(/media=cdrom/)) {
 		    editor = 'PVE.qemu.CDEdit';
 		}
 	    }
@@ -497,12 +499,12 @@ Ext.define('PVE.qemu.HardwareView', {
 		rowdef.tdCls == 'pve-itype-icon-storage' &&
 		(value && !value.match(/media=cdrom/));
 
-	    var isCloudInit = (value && value.match(/vm-.*-cloudinit/));
+	    var isCloudInit = (value && value.toString().match(/vm-.*-cloudinit/));
 
 	    var isEfi = (key === 'efidisk0');
 
 	    remove_btn.setDisabled(rec.data['delete'] || (rowdef.never_delete === true));
-	    remove_btn.setText(isUsedDisk ? remove_btn.altText : remove_btn.defaultText);
+	    remove_btn.setText((isUsedDisk && !isCloudInit) ? remove_btn.altText : remove_btn.defaultText);
 
 	    edit_btn.setDisabled(rec.data['delete'] || !rowdef.editor || isCloudInit);