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

Fix 2718: GUI: handle localtime option correctly

Browse Source 
The backend treats an undefined value and 0 differently. If the option
is undefined, it will still be set for Windows in config_to_command.
Replace the checkbox with a combobox covering all options.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2020-05-19 10:12:19 +02:00 committed by Thomas Lamprecht
parent baed2b7c41
commit 0beff18b8e
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/manager6/Utils.js
View File

@ -273,6 +273,13 @@ Ext.define('PVE.Utils', { utilities: {
return fa.join(', '); return fa.join(', ');
}, },
render_localtime: function(value) {
if (value === '__default__') {
return Proxmox.Utils.defaultText + ' (' + gettext('Enabled for Windows') + ')';
}
return Proxmox.Utils.format_boolean(value);
},
render_qga_features: function(value) { render_qga_features: function(value) {
if (!value) { if (!value) {
return Proxmox.Utils.defaultText + ' (' + Proxmox.Utils.disabledText + ')'; return Proxmox.Utils.defaultText + ' (' + Proxmox.Utils.disabledText + ')';

15
www/manager6/qemu/Options.js
View File

@ -212,17 +212,20 @@ Ext.define('PVE.qemu.Options', {
}, },
localtime: { localtime: {
header: gettext('Use local time for RTC'), header: gettext('Use local time for RTC'),
defaultValue: false, defaultValue: '__default__',
renderer: Proxmox.Utils.format_boolean, renderer: PVE.Utils.render_localtime,
editor: caps.vms['VM.Config.Options'] ? { editor: caps.vms['VM.Config.Options'] ? {
xtype: 'proxmoxWindowEdit', xtype: 'proxmoxWindowEdit',
subject: gettext('Use local time for RTC'), subject: gettext('Use local time for RTC'),
items: { items: {
xtype: 'proxmoxcheckbox', xtype: 'proxmoxKVComboBox',
name: 'localtime', name: 'localtime',
uncheckedValue: 0, value: '__default__',
defaultValue: 0, comboItems: [
deleteDefaultValue: true, ['__default__', PVE.Utils.render_localtime('__default__')],
[1, PVE.Utils.render_localtime(1)],
[0, PVE.Utils.render_localtime(0)],
],
labelWidth: 140, labelWidth: 140,
fieldLabel: gettext('Use local time for RTC') fieldLabel: gettext('Use local time for RTC')
} }