From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 39C26754DC for ; Wed, 21 Apr 2021 17:16:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 25D2311A52 for ; Wed, 21 Apr 2021 17:16:28 +0200 (CEST) Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 5038A11A3D for ; Wed, 21 Apr 2021 17:16:24 +0200 (CEST) Received: by mail-lf1-x12f.google.com with SMTP id j18so67435895lfg.5 for ; Wed, 21 Apr 2021 08:16:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=K+rm40CMqfnCqawL+CelZhJ8IffLPuzWsYTjRnlriYA=; b=QS2P4UBx1fAJrEj48XmjkIZCl+8wncNo0digfJQqDtf86BiuVFG0mY/gGvjDPlAc8j 5mfMXhMTmrjfPzp8nqy+vgtKnREB++Nqd3jzcejCt+uJHiGUpPEk6eMhdLuS00IGCu17 EFUt6qy1FsVnraW1IfiZjhhy+l0/LOQYBWnhFTxvDEfKL4dCXZoqg1DkK2ApUg38mDCK ku/kk4yT4cbHJuuhgB514P1lUvF7fnB+JFWEQQxWMKf2utIRDn7aN9/ojsoIxwMYfwgw IBkH0aGOdjj7LHbVYQoO9bjp6u5G6MOhI0AAaxPA+uQMy7DtgcQ0hMsOs8FAMm8Pr6Gm fg+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=K+rm40CMqfnCqawL+CelZhJ8IffLPuzWsYTjRnlriYA=; b=hiIiiytRmqLsve9qOUGb8HgTXCfXQEtUy846Iqcxz+cIAJwyGkMBj90uO5hxhJTzKc BfWi5oFKXSkhe83+h1kSWJ3A/bX0YJ9/Im7CPpEAsUk8CjxGCk4sLEAOK7etTBw1HmLA mvY1DbPhtvACSnLiA4lZPPV0Xm7pAGYDr0RbgNv3F04JVrDvwx1WthS6Z3EGLyhGqf74 2GNbsWSepfmZwkjgHxLJA8X/eiELMkPN5PdprlI/V2gI6i0LNSFWY/rAjYTZLU2a/X0o vMXMkQI8Lb9+wOLvW/Jbqv3Dws7OmEo7hiYjTS/49YPWDfEj1EBTFCqtFwiHrmzfkBOk 9rUw== X-Gm-Message-State: AOAM530rhw4WvInco3/R2gw21LWtYkqMEmAFvlcjaLUa6byE8mMRCaVy PUQCnE+bfx5qP056jW4BP9MoWU/3AoID7XzG6AWHuQCG X-Google-Smtp-Source: ABdhPJznGyInhHgAerGwiBPgoYVObgkv31GTCbuHV8J2wMkbzM7oW4mUm5C984Gh3cVReesrtSm2HupVTix3kTKwyCY= X-Received: by 2002:a05:6512:1106:: with SMTP id l6mr9515249lfg.653.1619018177669; Wed, 21 Apr 2021 08:16:17 -0700 (PDT) MIME-Version: 1.0 References: <20210421145116.20713-1-d.csapak@proxmox.com> In-Reply-To: <20210421145116.20713-1-d.csapak@proxmox.com> From: Dominik Csapak Date: Wed, 21 Apr 2021 17:16:04 +0200 Message-ID: To: Proxmox VE development discussion X-SPAM-LEVEL: Spam detection results: 0 DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain FREEMAIL_FROM 0.001 Sender email is commonly abused enduser mail provider HTML_MESSAGE 0.001 HTML included in message RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [pve-devel] [PATCH manager] ui: Utils: change default Console order for vms X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 15:16:58 -0000 On Wed, Apr 21, 2021, 16:51 Dominik Csapak wrote: > 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 > --- > 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..a113c690 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 === 'lxc' ? 'xtermjs' : > 'vv'); > Just noticed that this is wrong, we want to reverse this and check for 'kvm' instead, else the node and upgrade console will use spice now.. Sorry for the noise if (dv === 'vv' && !allowSpice) { > dv = allowXtermjs ? 'xtermjs' : 'html5'; > } else if (dv === 'xtermjs' && !allowXtermjs) { > -- > 2.20.1 > > > > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel > >