diff --git a/form/Checkbox.js b/form/Checkbox.js index 5cf5435..4c7be0c 100644 --- a/form/Checkbox.js +++ b/form/Checkbox.js @@ -2,10 +2,11 @@ Ext.define('Proxmox.form.Checkbox', { extend: 'Ext.form.field.Checkbox', alias: ['widget.proxmoxcheckbox'], - defaultValue: undefined, - - deleteDefaultValue: false, - deleteEmpty: false, + config: { + defaultValue: undefined, + deleteDefaultValue: false, + deleteEmpty: false + }, inputValue: '1', @@ -17,12 +18,12 @@ Ext.define('Proxmox.form.Checkbox', { val = me.getSubmitValue(); if (val !== null) { data = {}; - if ((val == me.defaultValue) && me.deleteDefaultValue) { + if ((val == me.getDefaultValue()) && me.getDeleteDefaultValue()) { data['delete'] = me.getName(); } else { data[me.getName()] = val; } - } else if (me.deleteEmpty) { + } else if (me.getDeleteEmpty()) { data = {}; data['delete'] = me.getName(); } diff --git a/form/IntegerField.js b/form/IntegerField.js index b947ea6..dc18f1d 100644 --- a/form/IntegerField.js +++ b/form/IntegerField.js @@ -2,13 +2,15 @@ Ext.define('Proxmox.form.field.Integer',{ extend: 'Ext.form.field.Number', alias: 'widget.proxmoxintegerfield', + config: { + deleteEmpty: false + }, + allowDecimals: false, allowExponential: false, step: 1, - deleteEmpty: false, - - getSubmitData: function() { + getSubmitData: function() { var me = this, data = null, val; @@ -17,7 +19,7 @@ Ext.define('Proxmox.form.field.Integer',{ if (val !== undefined && val !== null && val !== '') { data = {}; data[me.getName()] = val; - } else if (me.deleteEmpty) { + } else if (me.getDeleteEmpty()) { data = {}; data['delete'] = me.getName(); } diff --git a/form/KVComboBox.js b/form/KVComboBox.js index d8167ac..0970fcf 100644 --- a/form/KVComboBox.js +++ b/form/KVComboBox.js @@ -9,7 +9,10 @@ Ext.define('Proxmox.form.KVComboBox', { extend: 'Ext.form.field.ComboBox', alias: 'widget.proxmoxKVComboBox', - deleteEmpty: true, + config: { + deleteEmpty: true + }, + comboItems: undefined, displayField: 'value', valueField: 'key', @@ -25,7 +28,7 @@ Ext.define('Proxmox.form.KVComboBox', { if (val !== null && val !== '' && val !== '__default__') { data = {}; data[me.getName()] = val; - } else if (me.deleteEmpty) { + } else if (me.getDeleteEmpty()) { data = {}; data['delete'] = me.getName(); } diff --git a/form/TextField.js b/form/TextField.js index 3fd36ce..feab4bc 100644 --- a/form/TextField.js +++ b/form/TextField.js @@ -2,9 +2,11 @@ Ext.define('Proxmox.form.field.Textfield', { extend: 'Ext.form.field.Text', alias: ['widget.proxmoxtextfield'], - skipEmptyText: true, + config: { + skipEmptyText: true, - deleteEmpty: false, + deleteEmpty: false, + }, getSubmitData: function() { var me = this, @@ -15,7 +17,7 @@ Ext.define('Proxmox.form.field.Textfield', { if (val !== null) { data = {}; data[me.getName()] = val; - } else if (me.deleteEmpty) { + } else if (me.getDeleteEmpty()) { data = {}; data['delete'] = me.getName(); } @@ -31,6 +33,6 @@ Ext.define('Proxmox.form.field.Textfield', { return value; } - return me.skipEmptyText ? null: value; + return me.getSkipEmptyText() ? null: value; } });