use IntegerField from widget toolkit

there we implemented deleteEmpty, which we can use in some cases.
this also fixes a bug in the ControllerSelector where
an empty field would be allowed (but should not)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Reviewed-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index fdaf15d4328927538532a8c663032d85aa37cc57..f9b6deb4675786f4b1d78b6bc5b75c5af991d936 100644 (file)
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -28,7 +28,6 @@ JSSRC=                                                        \
        data/RRDStore.js                                \
        form/VLanField.js                               \
        form/Checkbox.js                                \
-       form/IntegerField.js                            \
        form/RRDTypeSelector.js                         \
        form/KVComboBox.js                              \
        form/Boolean.js                                 \

diff --git a/www/manager6/ceph/Pool.js b/www/manager6/ceph/Pool.js
index cd84ee6d9932fa9cc4abeed39795a63bcff116ab..33726f9abe894cbbdf86aa246dd4b486c2ea8421 100644 (file)
--- a/www/manager6/ceph/Pool.js
+++ b/www/manager6/ceph/Pool.js
@@ -16,7 +16,7 @@ Ext.define('PVE.CephCreatePool', {
            allowBlank: false
        },
        {
-           xtype: 'pveIntegerField',
+           xtype: 'proxmoxintegerfield',
            fieldLabel: gettext('Size'),
            name: 'size',
            value: 3,
@@ -25,7 +25,7 @@ Ext.define('PVE.CephCreatePool', {
            allowBlank: false
        },
        {
-           xtype: 'pveIntegerField',
+           xtype: 'proxmoxintegerfield',
            fieldLabel: gettext('Min. Size'),
            name: 'min_size',
            value: 2,
@@ -40,7 +40,7 @@ Ext.define('PVE.CephCreatePool', {
            allowBlank: false
        },
        {
-           xtype: 'pveIntegerField',
+           xtype: 'proxmoxintegerfield',
            fieldLabel: 'pg_num',
            name: 'pg_num',
            value: 64,

diff --git a/www/manager6/dc/AuthEdit.js b/www/manager6/dc/AuthEdit.js
index 612436d16ea48ed770ba5a270403b78c3cb416e0..ebbb799c24745d7644b8b9c42a6c20868eeca88a 100644 (file)
--- a/www/manager6/dc/AuthEdit.js
+++ b/www/manager6/dc/AuthEdit.js
@@ -106,7 +106,7 @@ Ext.define('PVE.dc.AuthEdit', {
                    name: 'server2'
                },
                {
-                    xtype: 'pveIntegerField',
+                    xtype: 'proxmoxintegerfield',
                     name: 'port',
                     fieldLabel: gettext('Port'),
                     minValue: 1,
@@ -147,7 +147,7 @@ Ext.define('PVE.dc.AuthEdit', {
         });
 
        column2.push({
-            xtype: 'pveIntegerField',
+            xtype: 'proxmoxintegerfield',
             name: 'oath_step',
            value: '',
            minValue: 10,
@@ -158,7 +158,7 @@ Ext.define('PVE.dc.AuthEdit', {
         });
 
        column2.push({
-            xtype: 'pveIntegerField',
+            xtype: 'proxmoxintegerfield',
             name: 'oath_digits',
            value: '',
            minValue: 6,

diff --git a/www/manager6/form/ControllerSelector.js b/www/manager6/form/ControllerSelector.js
index 1d1ca55672bd732cd750701147260284998be3cd..bc00eebffba896813b1912f03a68660f5a1f2cfc 100644 (file)
--- a/www/manager6/form/ControllerSelector.js
+++ b/www/manager6/form/ControllerSelector.js
@@ -117,12 +117,13 @@ Ext.define('PVE.form.ControllerSelector', {
                    }
                },
                {
-                   xtype: 'pveIntegerField',
+                   xtype: 'proxmoxintegerfield',
                    name: 'deviceid',
                    minValue: 0,
                    maxValue: PVE.form.ControllerSelector.maxIds.ide,
                    value: '0',
                    flex: 1,
+                   allowBlank: false,
                    validator: function(value) {
                        /*jslint confusion: true */
                        if (!me.rendered) {

diff --git a/www/manager6/form/IntegerField.js b/www/manager6/form/IntegerField.js
deleted file mode 100644 (file)
index 23011c4..0000000
--- a/www/manager6/form/IntegerField.js
+++ /dev/null
@@ -1,8 +0,0 @@
-Ext.define('PVE.form.IntegerField',{
-    extend: 'Ext.form.field.Number',
-    alias: 'widget.pveIntegerField',
-
-    allowDecimals: false,
-    allowExponential: false,
-    step: 1
-});

diff --git a/www/manager6/grid/FirewallOptions.js b/www/manager6/grid/FirewallOptions.js
index 60c09ee5cbccf7d164bafe5b777e002fd0d43f9e..72e0f6d4d8190e70c8ba525179198eef2f92ea37 100644 (file)
--- a/www/manager6/grid/FirewallOptions.js
+++ b/www/manager6/grid/FirewallOptions.js
@@ -59,7 +59,7 @@ Ext.define('PVE.FirewallOptions', {
                    subject: text,
                    fieldDefaults: { labelWidth: labelWidth || 100 },
                    items: {
-                       xtype: 'pveIntegerField',
+                       xtype: 'proxmoxintegerfield',
                        name: name,
                        minValue: minValue,
                        fieldLabel: text,

diff --git a/www/manager6/ha/GroupEdit.js b/www/manager6/ha/GroupEdit.js
index 0f7e41c3fff59bf7d0dcdb668f6a684e996ce367..fdaab4cbeec318d37a7690fae2111bf0ac53a127 100644 (file)
--- a/www/manager6/ha/GroupEdit.js
+++ b/www/manager6/ha/GroupEdit.js
@@ -78,7 +78,7 @@ Ext.define('PVE.ha.GroupInputPanel', {
                    sortable: true,
                    stopSelection: true,
                    widget: {
-                       xtype: 'pveIntegerField',
+                       xtype: 'proxmoxintegerfield',
                        minValue: 0,
                        maxValue: 1000,
                        isFormField: false,

diff --git a/www/manager6/ha/ResourceEdit.js b/www/manager6/ha/ResourceEdit.js
index d21d6bd01849698927cef476a1bc857b6a46d05b..ec029494b00fe89e4cb496486b3e1c76e3f69f29 100644 (file)
--- a/www/manager6/ha/ResourceEdit.js
+++ b/www/manager6/ha/ResourceEdit.js
@@ -88,7 +88,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', {
                validateExists: true
            },
            {
-               xtype: 'pveIntegerField',
+               xtype: 'proxmoxintegerfield',
                name: 'max_restart',
                fieldLabel: gettext('Max. Restart'),
                value: 1,
@@ -97,7 +97,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', {
                allowBlank: false
            },
            {
-               xtype: 'pveIntegerField',
+               xtype: 'proxmoxintegerfield',
                name: 'max_relocate',
                fieldLabel: gettext('Max. Relocate'),
                value: 1,

diff --git a/www/manager6/lxc/Options.js b/www/manager6/lxc/Options.js
index 4a438877a34011080c508e967d2474d59b79f170..4a855d52fbdf4804fa8bb4a0443791db88024f08 100644 (file)
--- a/www/manager6/lxc/Options.js
+++ b/www/manager6/lxc/Options.js
@@ -81,23 +81,14 @@ Ext.define('PVE.lxc.Options', {
                    xtype: 'pveWindowEdit',
                    subject: gettext('TTY count'),
                    items: {
-                       xtype: 'pveIntegerField',
+                       xtype: 'proxmoxintegerfield',
                        name: 'tty',
                        minValue: 0,
                        maxValue: 6,
                        value: 2,
                        fieldLabel: gettext('TTY count'),
-                       allowEmpty: gettext('Default'),
-                       getSubmitData: function() {
-                           var me = this;
-                           var val = me.getSubmitValue();
-                           if (val !== null && val !== '' && val !== '2') {
-                               return { tty: val };
-                           } else {
-                               return { 'delete' : 'tty' };
-                           }
-                       }
-
+                       emptyText: gettext('Default'),
+                       deleteEmpty: true
                    }
                } : undefined
            },

diff --git a/www/manager6/lxc/ResourceEdit.js b/www/manager6/lxc/ResourceEdit.js
index 641d863619022d9326dc867c53b9558e9028a5d5..4666df8f39b12fe7d78e0c6a8d02bd66a04164a4 100644 (file)
--- a/www/manager6/lxc/ResourceEdit.js
+++ b/www/manager6/lxc/ResourceEdit.js
@@ -60,13 +60,14 @@ Ext.define('PVE.lxc.CPUInputPanel', {
 
        var column1 = [
             {
-                xtype: 'pveIntegerField',
+                xtype: 'proxmoxintegerfield',
                 name: 'cores',
                minValue: 1,
                maxValue: 128,
                value: me.insideWizard ? 1 : '',
                fieldLabel: gettext('Cores'),
                allowBlank: true,
+               deleteEmpty: true,
                 emptyText: gettext('unlimited')
             }
        ];
@@ -84,7 +85,7 @@ Ext.define('PVE.lxc.CPUInputPanel', {
                 emptyText: gettext('unlimited')
            },
            {
-               xtype: 'pveIntegerField',
+               xtype: 'proxmoxintegerfield',
                name: 'cpuunits',
                fieldLabel: gettext('CPU units'),
                value: 1024,
@@ -119,7 +120,7 @@ Ext.define('PVE.lxc.MemoryInputPanel', {
 
        var items = [
            {
-               xtype: 'pveIntegerField',
+               xtype: 'proxmoxintegerfield',
                name: 'memory',
                minValue: 16,
                maxValue: 512*1024,
@@ -130,7 +131,7 @@ Ext.define('PVE.lxc.MemoryInputPanel', {
                allowBlank: false
            },
            {
-               xtype: 'pveIntegerField',
+               xtype: 'proxmoxintegerfield',
                name: 'swap',
                minValue: 0,
                maxValue: 128*1024,

diff --git a/www/manager6/qemu/CPUOptions.js b/www/manager6/qemu/CPUOptions.js
index 3cadf226609d5032d0f62963d0d698fb89731400..3c75990bb98b933d56429708948eaf63b1813cd7 100644 (file)
--- a/www/manager6/qemu/CPUOptions.js
+++ b/www/manager6/qemu/CPUOptions.js
@@ -5,7 +5,6 @@ Ext.define('PVE.qemu.CPUOptionsInputPanel', {
     onGetValues: function(values) {
        var me = this;
 
-       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);
 
@@ -17,12 +16,13 @@ Ext.define('PVE.qemu.CPUOptionsInputPanel', {
 
         var items = [
             {
-                xtype: 'pveIntegerField',
+                xtype: 'proxmoxintegerfield',
                 name: 'vcpus',
                 minValue: 1,
                 maxValue: me.maxvcpus,
                 value: '',
                 fieldLabel: gettext('VCPUs'),
+               deleteEmpty: true,
                 allowBlank: true,
                 emptyText: me.maxvcpus
             },
@@ -38,12 +38,13 @@ Ext.define('PVE.qemu.CPUOptionsInputPanel', {
                 emptyText: gettext('unlimited')
             },
            {
-                xtype: 'pveIntegerField',
+                xtype: 'proxmoxintegerfield',
                 name: 'cpuunits',
                 fieldLabel: gettext('CPU units'),
                 minValue: 8,
                 maxValue: 500000,
                 value: '1024',
+               deleteEmpty: true,
                 allowBlank: true
             }
        ];

diff --git a/www/manager6/qemu/HDThrottle.js b/www/manager6/qemu/HDThrottle.js
index 8d2af2a682704e63546d4d6cf98351fb3e3cabb5..1cae658fb1b929dc127a6850d37cd4144e0d3242 100644 (file)
--- a/www/manager6/qemu/HDThrottle.js
+++ b/www/manager6/qemu/HDThrottle.js
@@ -109,7 +109,7 @@ Ext.define('PVE.qemu.HDThrottleInputPanel', {
 
         me.column2.push(me.mbps_wr_max);
 
-        me.iops_rd = Ext.widget('pveIntegerField', {
+        me.iops_rd = Ext.widget('proxmoxintegerfield', {
             name: 'iops_rd',
             minValue: 10,
             step: 10,
@@ -120,7 +120,7 @@ Ext.define('PVE.qemu.HDThrottleInputPanel', {
 
         me.column1.push(me.iops_rd);
 
-        me.iops_rd_max = Ext.widget('pveIntegerField', {
+        me.iops_rd_max = Ext.widget('proxmoxintegerfield', {
             name: 'iops_rd_max',
             minValue: 10,
             step: 10,
@@ -131,7 +131,7 @@ Ext.define('PVE.qemu.HDThrottleInputPanel', {
 
         me.column2.push(me.iops_rd_max);
 
-        me.iops_wr = Ext.widget('pveIntegerField', {
+        me.iops_wr = Ext.widget('proxmoxintegerfield', {
             name: 'iops_wr',
             minValue: 10,
             step: 10,
@@ -142,7 +142,7 @@ Ext.define('PVE.qemu.HDThrottleInputPanel', {
 
         me.column1.push(me.iops_wr);
 
-        me.iops_wr_max = Ext.widget('pveIntegerField', {
+        me.iops_wr_max = Ext.widget('proxmoxintegerfield', {
             name: 'iops_wr_max',
             minValue: 10,
             step: 10,

diff --git a/www/manager6/qemu/MemoryEdit.js b/www/manager6/qemu/MemoryEdit.js
index f979d409ac07a7edc0f816d7fbe191b95642c010..93b1b717dd977b93a1b10c66eee3a6fe44c75005 100644 (file)
--- a/www/manager6/qemu/MemoryEdit.js
+++ b/www/manager6/qemu/MemoryEdit.js
@@ -109,7 +109,7 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
                }
            },
            {
-               xtype: 'pveIntegerField',
+               xtype: 'proxmoxintegerfield',
                name: 'balloon',
                disabled: true,
                minValue: 0,
@@ -122,7 +122,7 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
                allowBlank: false
            },
            {
-               xtype: 'pveIntegerField',
+               xtype: 'proxmoxintegerfield',
                name: 'shares',
                disabled: true,
                minValue: 0,

diff --git a/www/manager6/qemu/NetworkEdit.js b/www/manager6/qemu/NetworkEdit.js
index 9339d84673d7ec24635bef642fe3a9e501b5bff5..bc72c1fcdf2a3f12982aea9f622b8d92517e924f 100644 (file)
--- a/www/manager6/qemu/NetworkEdit.js
+++ b/www/manager6/qemu/NetworkEdit.js
@@ -149,7 +149,7 @@ Ext.define('PVE.qemu.NetworkInputPanel', {
                allowBlank: true
            },
            {
-               xtype: 'pveIntegerField',
+               xtype: 'proxmoxintegerfield',
                name: 'queues',
                fieldLabel: 'Multiqueue',
                minValue: 1,

diff --git a/www/manager6/qemu/ProcessorEdit.js b/www/manager6/qemu/ProcessorEdit.js
index e8afc7bb423af1baaa295aa47351edab065e5284..be31615f5f094cfa8425aef415d8442da4450b6c 100644 (file)
--- a/www/manager6/qemu/ProcessorEdit.js
+++ b/www/manager6/qemu/ProcessorEdit.js
@@ -61,7 +61,7 @@ Ext.define('PVE.qemu.ProcessorInputPanel', {
 
        me.column1 = [
            {
-               xtype: 'pveIntegerField',
+               xtype: 'proxmoxintegerfield',
                name: 'sockets',
                minValue: 1,
                maxValue: 4,
@@ -77,7 +77,7 @@ Ext.define('PVE.qemu.ProcessorInputPanel', {
                }
            },
            {
-               xtype: 'pveIntegerField',
+               xtype: 'proxmoxintegerfield',
                name: 'cores',
                minValue: 1,
                maxValue: 128,

diff --git a/www/manager6/storage/DirEdit.js b/www/manager6/storage/DirEdit.js
index 4e196431b5fab4b0f1095ed254bba0f983611f9e..74255072fc0165607476a99cbceaa408cc5e3885 100644 (file)
--- a/www/manager6/storage/DirEdit.js
+++ b/www/manager6/storage/DirEdit.js
@@ -62,7 +62,7 @@ Ext.define('PVE.storage.DirInputPanel', {
                fieldLabel: gettext('Shared')
            },
            {
-               xtype: 'pveIntegerField',
+               xtype: 'proxmoxintegerfield',
                fieldLabel: gettext('Max Backups'),
                disabled: true,
                name: 'maxfiles',

diff --git a/www/manager6/storage/GlusterFsEdit.js b/www/manager6/storage/GlusterFsEdit.js
index 1d135690457696af7f87b16598e5c03593df8fec..ac6cde637c7e625e82f7f850656d0412de8cb63f 100644 (file)
--- a/www/manager6/storage/GlusterFsEdit.js
+++ b/www/manager6/storage/GlusterFsEdit.js
@@ -148,7 +148,7 @@ Ext.define('PVE.storage.GlusterFsInputPanel', {
                fieldLabel: gettext('Enable')
            },
            {
-               xtype: 'pveIntegerField',
+               xtype: 'proxmoxintegerfield',
                fieldLabel: gettext('Max Backups'),
                disabled: true,
                name: 'maxfiles',

diff --git a/www/manager6/storage/NFSEdit.js b/www/manager6/storage/NFSEdit.js
index 728a3ffd2021ae81260263464c1350195bc20aa3..954cceb3df3b88b8abcdc1de7ed65dab15476469 100644 (file)
--- a/www/manager6/storage/NFSEdit.js
+++ b/www/manager6/storage/NFSEdit.js
@@ -143,7 +143,7 @@ Ext.define('PVE.storage.NFSInputPanel', {
                fieldLabel: gettext('Enable')
            },
            {
-               xtype: 'pveIntegerField',
+               xtype: 'proxmoxintegerfield',
                fieldLabel: gettext('Max Backups'),
                disabled: true,
                name: 'maxfiles',

diff --git a/www/manager6/window/BulkAction.js b/www/manager6/window/BulkAction.js
index 87e972b3d4e88ef51c139b3d98273558ec92e2b5..f7885cda67879ba10356911e02869d4089c6c320 100644 (file)
--- a/www/manager6/window/BulkAction.js
+++ b/www/manager6/window/BulkAction.js
@@ -73,7 +73,7 @@ Ext.define('PVE.window.BulkAction', {
                    onlineValidator: true
                },
                {
-                   xtype: 'pveIntegerField',
+                   xtype: 'proxmoxintegerfield',
                    name: 'maxworkers',
                    minValue: 1,
                    maxValue: 100,