[pve-devel] [PATCH manager 1/2] fix wrong defaultConsole in tree

Dominik Csapak d.csapak at proxmox.com
Fri Jul 12 13:33:06 CEST 2019


having spice does not mean it can also have xtermjs, and
we get the information in the status call already
so give the correct parameters to openDefaultConsoleWindow

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 www/manager6/Utils.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index b4014156..d72ba64f 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1027,8 +1027,11 @@ Ext.define('PVE.Utils', { utilities: {
 		    Ext.Msg.alert('Error', response.htmlStatus);
 		},
 		success: function(response, opts) {
-		    var allowSpice = !!response.result.data.spice;
-		    PVE.Utils.openDefaultConsoleWindow(allowSpice, 'kvm', vmid, nodename, vmname);
+		    var consoles = {
+			spice: !!response.result.data.spice,
+			xtermjs: !!response.result.data.serial,
+		    };
+		    PVE.Utils.openDefaultConsoleWindow(consoles, 'kvm', vmid, nodename, vmname);
 		}
 	    });
 	} else if (record.data.type === 'lxc' && !record.data.template) {
-- 
2.20.1





More information about the pve-devel mailing list