proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-15 23:20:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ha resource edit: adapt to new service state

Browse Source 
Add the new stopped state to the ResourceEdit panel.
Rename enabled state to started as done in ha-manager.

As 'enabled' is now the wrong label use the more correct label
'Request state', for both the resource edit window and the grid
column.

Do this by replacing the checkbox with a KVCombogrid.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2016-11-18 17:14:34 +01:00 committed by Dietmar Maurer
parent 766998b1ae
commit ecd45352ab
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
www/manager6/ha/ResourceEdit.js
View File

@ -13,13 +13,6 @@ Ext.define('PVE.ha.VMResourceInputPanel', {
delete values.vmid; delete values.vmid;
if (values.enable) {
values.state = 'enabled';
} else {
values.state = 'disabled';
}
delete values.enable;
PVE.Utils.delete_if_default(values, 'group', '', me.create); PVE.Utils.delete_if_default(values, 'group', '', me.create);
PVE.Utils.delete_if_default(values, 'max_restart', '1', me.create); PVE.Utils.delete_if_default(values, 'max_restart', '1', me.create);
PVE.Utils.delete_if_default(values, 'max_relocate', '1', me.create); PVE.Utils.delete_if_default(values, 'max_relocate', '1', me.create);
@ -67,6 +60,8 @@ Ext.define('PVE.ha.VMResourceInputPanel', {
} }
]; ];
// value is expected to be integer as it's above, ignore that
/*jslint confusion: true */
me.column2 = [ me.column2 = [
{ {
xtype: 'pveHAGroupSelector', xtype: 'pveHAGroupSelector',
@ -74,14 +69,18 @@ Ext.define('PVE.ha.VMResourceInputPanel', {
fieldLabel: gettext('Group') fieldLabel: gettext('Group')
}, },
{ {
xtype: 'pvecheckbox', xtype: 'pveKVComboBox',
name: 'enable', name: 'state',
checked: true, value: 'started',
uncheckedValue: 0, fieldLabel: gettext('Request State'),
fieldLabel: gettext('enabled'), comboItems: [
['started', gettext('Started')],
['stopped', gettext('Stopped')],
['disabled', gettext('Disabled')]
],
listeners: { listeners: {
'change': function(field, newValue) { 'change': function(field, newValue) {
if (newValue === false) { if (newValue === 'disabled') {
disabledHint.setVisible(true); disabledHint.setVisible(true);
} }
else { else {
@ -94,6 +93,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', {
}, },
disabledHint disabledHint
]; ];
/*jslint confusion: false */
me.columnB = [ me.columnB = [
{ {
@ -143,11 +143,6 @@ Ext.define('PVE.ha.VMResourceEdit', {
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;
values.enable = true;
if (values.state === 'disabled') {
values.enable = false;
}
var regex = /^(\S+):(\S+)$/; var regex = /^(\S+):(\S+)$/;
var res = regex.exec(values.sid); var res = regex.exec(values.sid);

2
www/manager6/ha/Resources.js
View File

@ -119,7 +119,7 @@ Ext.define('PVE.ha.ResourcesView', {
dataIndex: 'sid' dataIndex: 'sid'
}, },
{ {
header: gettext('State'), header: gettext('Request State'),
width: 100, width: 100,
sortable: true, sortable: true,
renderer: function(v) { renderer: function(v) {