From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v2] ui: Utils: change default Console order for vms
Date: Thu, 22 Apr 2021 08:39:02 +0200 [thread overview]
Message-ID: <20210422063902.26490-1-d.csapak@proxmox.com> (raw)
we want to use spice for vms more than xtermjs if both are available
(since spice must be chosen as display in that case)
so the resulting order of preference for vms is:
spice
xtermjs
novnc
since all methods work for containers always, there we use
xtermjs by default, or what is chosen in the datacenter option
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
changes from v1:
* fixed the default so that it is only 'vv' for vms, not other
types of consoles (shell, upgrade,..)
www/manager6/Utils.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index f502950f..7fcda854 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1271,7 +1271,7 @@ Ext.define('PVE.Utils', {
},
openDefaultConsoleWindow: function(consoles, consoleType, vmid, nodename, vmname, cmd) {
- var dv = PVE.Utils.defaultViewer(consoles);
+ var dv = PVE.Utils.defaultViewer(consoles, consoleType);
PVE.Utils.openConsoleWindow(dv, consoleType, vmid, nodename, vmname, cmd);
},
@@ -1309,7 +1309,7 @@ Ext.define('PVE.Utils', {
}
},
- defaultViewer: function(consoles) {
+ defaultViewer: function(consoles, type) {
var allowSpice, allowXtermjs;
if (consoles === true) {
@@ -1319,7 +1319,7 @@ Ext.define('PVE.Utils', {
allowSpice = consoles.spice;
allowXtermjs = !!consoles.xtermjs;
}
- var dv = PVE.VersionInfo.console || 'xtermjs';
+ let dv = PVE.VersionInfo.console || (type === 'kvm' ? 'vv' : 'xtermjs');
if (dv === 'vv' && !allowSpice) {
dv = allowXtermjs ? 'xtermjs' : 'html5';
} else if (dv === 'xtermjs' && !allowXtermjs) {
--
2.20.1
next reply other threads:[~2021-04-22 6:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-22 6:39 Dominik Csapak [this message]
2021-04-22 8:02 ` [pve-devel] applied: " Thomas Lamprecht
2021-04-22 8:11 ` Dominik Csapak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210422063902.26490-1-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox