Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

allow xtermjs to be the default console

Browse Source 
if not available for a vm, we fallback to novnc like with spice

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2018-04-20 15:37:47 +02:00 committed by Thomas Lamprecht
parent b6d03d8bb5
commit 1294fe660c
3 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
www/manager6/Utils.js
View File

@ -278,20 +278,23 @@ Ext.define('PVE.Utils', { utilities: {
return data;
},
console_map: {
'__default__': Proxmox.Utils.defaultText + ' (HTML5)',
'vv': 'SPICE (remote-viewer)',
'html5': 'HTML5 (noVNC)',
'xtermjs': 'xterm.js',
},
render_console_viewer: function(value) {
if (!value || value === '__default__') {
return Proxmox.Utils.defaultText + ' (HTML5)';
} else if (value === 'vv') {
return 'SPICE (remote-viewer)';
} else if (value === 'html5') {
return 'HTML5 (noVNC)';
} else {
return value;
value = value || '__default__';
if (PVE.Utils.console_map[value]) {
return PVE.Utils.console_map[value];
}
return value;
},
console_viewer_array: function() {
return Ext.Array.map(['__default__','vv', 'html5'], function(v) {
return Ext.Array.map(Object.keys(PVE.Utils.console_map), function(v) {
return [v, PVE.Utils.render_console_viewer(v)];
});
},
@ -723,8 +726,8 @@ Ext.define('PVE.Utils', { utilities: {
function(m, addr, offset, original) { return addr; });
},
openDefaultConsoleWindow: function(allowSpice, vmtype, vmid, nodename, vmname) {
var dv = PVE.Utils.defaultViewer(allowSpice);
openDefaultConsoleWindow: function(consoles, vmtype, vmid, nodename, vmname) {
var dv = PVE.Utils.defaultViewer(consoles);
PVE.Utils.openConsoleWindow(dv, vmtype, vmid, nodename, vmname);
},
@ -765,10 +768,20 @@ Ext.define('PVE.Utils', { utilities: {
}
},
defaultViewer: function(allowSpice) {
defaultViewer: function(consoles) {
var allowSpice, allowXtermjs;
if (consoles === true) {
allowSpice = true;
allowXtermjs = true;
} else if (typeof consoles === 'object') {
allowSpice = consoles.spice;
allowXtermjs = consoles.xtermjs;
}
var vncdefault = 'html5';
var dv = PVE.VersionInfo.console || vncdefault;
if (dv === 'vv' && !allowSpice) {
if ((dv === 'vv' && !allowSpice) || (dv === 'xtermjs' && !allowXtermjs)) {
dv = vncdefault;
}

6
www/manager6/button/ConsoleButton.js
View File

@ -33,7 +33,11 @@ Ext.define('PVE.button.ConsoleButton', {
handler: function() {
var me = this;
PVE.Utils.openDefaultConsoleWindow(me.enableSpice, me.consoleType, me.vmid,
var consoles = {
spice: me.enableSpice,
xtermjs: me.enableXtermjs
};
PVE.Utils.openDefaultConsoleWindow(consoles, me.consoleType, me.vmid,
me.nodename, me.consoleName);
},

7
www/manager6/qemu/CmdMenu.js
View File

@ -169,7 +169,12 @@ Ext.define('PVE.qemu.CmdMenu', {
},
success: function(response, opts) {
var allowSpice = response.result.data.spice;
PVE.Utils.openDefaultConsoleWindow(allowSpice, 'kvm', vmid, nodename, vmname);
var allowXtermjs = response.result.data.serial;
var consoles = {
spice: allowSpice,
xtermjs: allowXtermjs
};
PVE.Utils.openDefaultConsoleWindow(consoles, 'kvm', vmid, nodename, vmname);
}
});
}