proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-25 10:10:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ui: save ui options from /cluster/options instead of version

Browse Source 
/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 <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2022-11-16 16:48:05 +01:00 committed by Thomas Lamprecht
parent 1f6d7f7fbf
commit b7f4cb7cf9
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
www/manager6/Utils.js
View File

@ -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,

2
www/manager6/Workspace.js
View File

@ -158,6 +158,8 @@ Ext.define('PVE.StdWorkspace', {
},
});
PVE.Utils.updateUIOptions();
Proxmox.Utils.API2Request({
url: '/cluster/sdn',
method: 'GET',

4
www/manager6/dc/OptionView.js
View File

@ -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;
}
});