ui: fix wrong defaultConsole fallback in tree

[pve-manager.git] / www / manager6 / Utils.js

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index cee086a8a57a121acc02a4fb7feccfc05ee46cd4..d72ba64f2bc0a1028422694adfa55611356547b6 100644 (file)
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -46,11 +46,11 @@ Ext.define('PVE.Utils', { utilities: {
        'p': gettext('Premium')
     },
 
-    noSubKeyHtml: 'You do not have a valid subscription for this server. Please visit <a target="_blank" href="http://www.proxmox.com/products/proxmox-ve/subscription-service-plans">www.proxmox.com</a> to get a list of available options.',
+    noSubKeyHtml: 'You do not have a valid subscription for this server. Please visit <a target="_blank" href="https://www.proxmox.com/products/proxmox-ve/subscription-service-plans">www.proxmox.com</a> to get a list of available options.',
 
     kvm_ostypes: {
        'Linux': [
-           { desc: '4.X/3.X/2.6 Kernel', val: 'l26' },
+           { desc: '5.x - 2.6 Kernel', val: 'l26' },
            { desc: '2.4 Kernel', val: 'l24' }
        ],
        'Microsoft Windows': [
@@ -404,7 +404,7 @@ Ext.define('PVE.Utils', { utilities: {
     },
 
     console_map: {
-       '__default__': Proxmox.Utils.defaultText + ' (HTML5)',
+       '__default__': Proxmox.Utils.defaultText + ' (xterm.js)',
        'vv': 'SPICE (remote-viewer)',
        'html5': 'HTML5 (noVNC)',
        'xtermjs': 'xterm.js'
@@ -945,10 +945,9 @@ Ext.define('PVE.Utils', { utilities: {
            allowSpice = consoles.spice;
            allowXtermjs = !!consoles.xtermjs;
        }
-       var vncdefault = 'html5';
-       var dv = PVE.VersionInfo.console || vncdefault;
+       var dv = PVE.VersionInfo.console || 'xtermjs';
        if ((dv === 'vv' && !allowSpice) || (dv === 'xtermjs' && !allowXtermjs)) {
-           dv = vncdefault;
+           dv = 'html5';
        }
 
        return dv;
@@ -1028,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) {