Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

add 'delete_if_default' helper and use it

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2016-11-02 10:31:19 +01:00 committed by Dietmar Maurer
parent b2f9a9e411
commit fe4f00adc9
4 changed files with 26 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
www/manager6/Utils.js
View File

@ -1253,6 +1253,21 @@ Ext.define('PVE.Utils', { utilities: {
menu.showAt(event.getXY());
}},
// helper for deleting field which are set to there default values
delete_if_default: function(values, fieldname, default_val, create) {
if (values[fieldname] === '' || values[fieldname] === default_val) {
if (!create) {
if (values['delete']) {
values['delete'] += ',' + fieldname;
} else {
values['delete'] = fieldname;
}
}
delete values[fieldname];
}
},
singleton: true,
constructor: function() {
var me = this;

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

@ -10,12 +10,6 @@ Ext.define('PVE.ha.VMResourceInputPanel', {
values.sid = values.vmid;
}
if (values.group === '') {
if (!me.create) {
values['delete'] = 'group';
}
delete values.group;
}
delete values.vmid;
@ -26,18 +20,9 @@ Ext.define('PVE.ha.VMResourceInputPanel', {
}
delete values.enable;
if (values.max_restart == '1') {
if (!me.create) {
values['delete'] = values['delete'] ? values['delete'] + ',max_restart' : 'max_restart';
}
delete values.max_restart;
}
if (values.max_relocate == '1') {
if (!me.create) {
values['delete'] = values['delete'] ? values['delete'] + ',max_relocate' : 'max_relocate';
}
delete values.max_relocate;
}
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_relocate', '1', me.create);
return values;
},

22
www/manager6/lxc/ResourceEdit.js
View File

@ -104,24 +104,10 @@ Ext.define('PVE.lxc.CPUInputPanel', {
onGetValues: function(values) {
var me = this;
var delete_array = [];
if (values.cores === '') {
delete_array.push('cores');
delete values.cores;
}
if (values.cpulimit === '' || values.cpulimit == '0') {
delete_array.push('cpulimit');
delete values.cpulimit;
}
if (values.cpuunits === '' || values.cpuunits == '1024') {
delete_array.push('cpuunits');
delete values.cpuunits;
}
if (delete_array.length) {
values['delete'] = delete_array.join(',');
}
PVE.Utils.delete_if_default(values, 'cores', '', me.insideWizard);
// cpu{limit,unit} aren't in the wizard so create is always false
PVE.Utils.delete_if_default(values, 'cpulimit', '0', 0);
PVE.Utils.delete_if_default(values, 'cpuunits', '1024', 0);
return values;
},

23
www/manager6/qemu/CPUOptions.js
View File

@ -5,28 +5,13 @@ Ext.define('PVE.qemu.CPUOptionsInputPanel', {
onGetValues: function(values) {
var me = this;
var delete_array = [];
if (values.vcpus === '') {
delete_array.push('vcpus');
delete values.vcpus;
}
if (values.cpulimit === '' || values.cpulimit == '0') {
delete_array.push('cpulimit');
delete values.cpulimit;
}
if (values.cpuunits === '' || values.cpuunits == '1024') {
delete_array.push('cpuunits');
delete values.cpuunits;
}
PVE.Utils.delete_if_default(values, 'vcpus', '', 0);
PVE.Utils.delete_if_default(values, 'cpulimit', '0', 0);
PVE.Utils.delete_if_default(values, 'cpuunits', '1024', 0);
if (delete_array.length) {
values['delete'] = delete_array.join(',');
}
return values;
},
initComponent : function() {
var me = this;