From b7f4cb7cf9a0d1849473567a628c1b5f3ed8293c Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Wed, 16 Nov 2022 16:48:05 +0100 Subject: [PATCH] ui: save ui options from /cluster/options instead of version /cluster/options is now the go to place for getting these options (until we have more options unrelated to the datacenter.cfg) Also move the use of the console from VersionInfo to here, since this will be the future place for ui related backend options. Signed-off-by: Dominik Csapak --- www/manager6/Utils.js | 13 ++++++++++++- www/manager6/Workspace.js | 2 ++ www/manager6/dc/OptionView.js | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index adcf082f..6ce22ded 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1332,7 +1332,7 @@ Ext.define('PVE.Utils', { allowSpice = consoles.spice; allowXtermjs = !!consoles.xtermjs; } - let dv = PVE.VersionInfo.console || (type === 'kvm' ? 'vv' : 'xtermjs'); + let dv = PVE.UIOptions.console || (type === 'kvm' ? 'vv' : 'xtermjs'); if (dv === 'vv' && !allowSpice) { dv = allowXtermjs ? 'xtermjs' : 'html5'; } else if (dv === 'xtermjs' && !allowXtermjs) { @@ -1854,6 +1854,17 @@ Ext.define('PVE.Utils', { }, notesTemplateVars: ['cluster', 'guestname', 'node', 'vmid'], + + updateUIOptions: function() { + Proxmox.Utils.API2Request({ + url: '/cluster/options', + method: 'GET', + success: function(response) { + PVE.UIOptions = {}; + PVE.UIOptions.console = response?.result?.data?.console; + }, + }); + }, }, singleton: true, diff --git a/www/manager6/Workspace.js b/www/manager6/Workspace.js index 2bb502e0..a7423508 100644 --- a/www/manager6/Workspace.js +++ b/www/manager6/Workspace.js @@ -158,6 +158,8 @@ Ext.define('PVE.StdWorkspace', { }, }); + PVE.Utils.updateUIOptions(); + Proxmox.Utils.API2Request({ url: '/cluster/sdn', method: 'GET', diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js index 5a2be182..ff96351d 100644 --- a/www/manager6/dc/OptionView.js +++ b/www/manager6/dc/OptionView.js @@ -343,9 +343,9 @@ Ext.define('PVE.dc.OptionView', { } var rec = store.getById('console'); - PVE.VersionInfo.console = rec.data.value; + PVE.UIOptions.console = rec.data.value; if (rec.data.value === '__default__') { - delete PVE.VersionInfo.console; + delete PVE.UIOptions.console; } });