]> git.proxmox.com Git - pve-manager.git/commitdiff
use KVCombobox from widget toolkit
authorThomas Lamprecht <t.lamprecht@proxmox.com>
Wed, 6 Dec 2017 11:16:07 +0000 (12:16 +0100)
committerDominik Csapak <d.csapak@proxmox.com>
Thu, 25 Jan 2018 12:36:38 +0000 (13:36 +0100)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Reviewed-by: Dominik Csapak <d.csapak@proxmox.com>
30 files changed:
www/manager6/Makefile
www/manager6/dc/AuthEdit.js
www/manager6/dc/Backup.js
www/manager6/dc/OptionView.js
www/manager6/form/BackupModeSelector.js
www/manager6/form/Boolean.js
www/manager6/form/BusTypeSelector.js
www/manager6/form/CPUModelSelector.js
www/manager6/form/CacheTypeSelector.js
www/manager6/form/CompressionSelector.js
www/manager6/form/ContentTypeSelector.js
www/manager6/form/DayOfWeekSelector.js
www/manager6/form/DiskFormatSelector.js
www/manager6/form/DisplaySelector.js
www/manager6/form/EmailNotificationSelector.js
www/manager6/form/FirewallPolicySelector.js
www/manager6/form/KVComboBox.js [deleted file]
www/manager6/form/NetworkCardSelector.js
www/manager6/form/QemuBiosSelector.js
www/manager6/form/ScsiHwSelector.js
www/manager6/form/VNCKeyboardSelector.js
www/manager6/form/iScsiProviderSelector.js
www/manager6/grid/FirewallOptions.js
www/manager6/grid/FirewallRules.js
www/manager6/ha/ResourceEdit.js
www/manager6/lxc/MPEdit.js
www/manager6/lxc/Options.js
www/manager6/qemu/BootOrderEdit.js
www/manager6/qemu/Clone.js
www/manager6/qemu/HDEdit.js

index ecdba5030f922bd6cf7a13f3e83cbf34c77ab619..4129e2bc745916efa59739f21e39da7693b2b5e0 100644 (file)
@@ -22,7 +22,6 @@ JSSRC=                                                        \
        data/ResourceStore.js                           \
        data/model/RRDModels.js                         \
        form/VLanField.js                               \
-       form/KVComboBox.js                              \
        form/Boolean.js                                 \
        form/CompressionSelector.js                     \
        form/PoolSelector.js                            \
index ca940f3cf044e977ef72dae338344be9e5bc5f30..dbb18c8b265a3c4c1a200e645de8200eb0bd93ca 100644 (file)
@@ -126,7 +126,7 @@ Ext.define('PVE.dc.AuthEdit', {
        // Two Factor Auth settings
 
         column2.push({
-            xtype: 'pveKVComboBox',
+            xtype: 'proxmoxKVComboBox',
             name: 'tfa',
            deleteEmpty: !me.isCreate,
            value: '',
index a79ab6ce7c61aa0805dd9d54d809ea557fb9bd22..9ddd4f0d98e33d5fda434ac4a3c1053e69720d79 100644 (file)
@@ -26,8 +26,8 @@ Ext.define('PVE.dc.BackupEdit', {
 
        /*jslint confusion: true*/
        // 'value' can be assigned a string or an array
-       var selModeField =  Ext.create('PVE.form.KVComboBox', {
-           xtype: 'pveKVComboBox',
+       var selModeField =  Ext.create('Proxmox.form.KVComboBox', {
+           xtype: 'proxmoxKVComboBox',
            comboItems: [
                ['include', gettext('Include selected VMs')],
                ['all', gettext('All')],
index 5da98ecc6bf2307253c3d5088ee4a5f286f806d8..2ca5ff554ce58dc23051fbfceae65424041230d1 100644 (file)
@@ -60,7 +60,7 @@ Ext.define('PVE.dc.ConsoleViewerEdit', {
        Ext.applyIf(me, {
            subject: gettext('Console Viewer'),
            items: {
-               xtype: 'pveKVComboBox',
+               xtype: 'proxmoxKVComboBox',
                name: 'console',
                value: '__default__',
                fieldLabel: gettext('Console Viewer'),
index c97b691d454f63f75b4deba7a90478f9286c8075..ca57dda9a09542b7f931f9df50c408d9630e4ad7 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.BackupModeSelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.pveBackupModeSelector'],
     comboItems: [
                 ['snapshot', gettext('Snapshot')],
index 37f794bf0c6bb5025e9efc0d6fae0c4eee1c76c2..5ae73fe7ab5f8fb91d5253b3bc95fa95ca7fe127 100644 (file)
@@ -1,6 +1,6 @@
 // boolean type including 'Default' (delete property from file)
 Ext.define('PVE.form.Boolean', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.booleanfield'],
     comboItems: [
        ['__default__', gettext('Default')],
index 8abdcf4b22932659069f02602be8fc3e540567bf..04643e7705af49fb941953a42b638ae7d4cc487d 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.BusTypeSelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: 'widget.pveBusSelector',
   
     noVirtIO: false,
index 041d54efd5019feed8f1ff8d2f4ba3b5ff57fcd8..d3315513087ff8c1ce36a143f904b400c0993a57 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.CPUModelSelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.CPUModelSelector'],
     comboItems: [
        ['__default__', Proxmox.Utils.defaultText + ' (kvm64)'],
index e650a61637a06b31ec838011ca5ee4753eca2380..0044848a073e42c289bf88920b4e5075e3b19990 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.CacheTypeSelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.CacheTypeSelector'],
     comboItems: [
        ['__default__', Proxmox.Utils.defaultText + " (" + gettext('No cache') + ")"],
index 79f8696ebfc4ffb4838c040373c561bcc8d3fcc3..8938fc0e06a4000c881882e38076d49e7a241233 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.CompressionSelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.pveCompressionSelector'],
     comboItems: [
                 ['0', Proxmox.Utils.noneText],
index 1ce39a97e6fbd66a2b9192eab8b0c19854887b58..7e8d266b4e91e8db22cfc5543a3b997b40750009 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.ContentTypeSelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.pveContentTypeSelector'],
 
     cts: undefined,
index 1b826b6431e690570d3d770cfd267b441ee5cb1d..bd23fc280fe0a6f46abfadfc0affeb40b8e3c222 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.DayOfWeekSelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.pveDayOfWeekSelector'],
     comboItems:[],
     initComponent: function(){
index 662f61c67297f639e42df13f81d22e6d235db78e..6c84fb98846a5e023401564c7410a258dc5e0e0c 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.DiskFormatSelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: 'widget.pveDiskFormatSelector',
     comboItems:  [
        ['raw', gettext('Raw disk image') + ' (raw)'],
index d5ab30a272791acdb8c92f61674fa8f7989a9d3c..4b753e4589aa1d6d3dbef1d02b0197b47b8106bb 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.DisplaySelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.DisplaySelector'],
     comboItems: PVE.Utils.kvm_vga_driver_array()
 });
index 36e35c503f13ce6d4ba16e26ad957f2e76df487c..67abbec171c4b4c1e1f3ad3268f0be6193b397bd 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.EmailNotificationSelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.pveEmailNotificationSelector'],
     comboItems: [
                 ['always', gettext('Always')],
index 05eea901d23b79774f7f4dd4a7a7a5eda1f3c612..c15f73e32da591a11a1598ed5f4681433714c7e4 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.FirewallPolicySelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.pveFirewallPolicySelector'],
     comboItems: [
            ['ACCEPT', 'ACCEPT'],
diff --git a/www/manager6/form/KVComboBox.js b/www/manager6/form/KVComboBox.js
deleted file mode 100644 (file)
index 5263ed0..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Key-Value ComboBox
- *
- * config properties:
- * comboItems: an array of Key - Value pairs
- * deleteEmpty: if set to true (default), an empty value received from the
- * comboBox will reset the property to its default value
- */
-Ext.define('PVE.form.KVComboBox', {
-    extend: 'Ext.form.field.ComboBox',
-    alias: 'widget.pveKVComboBox',
-
-    deleteEmpty: true,
-    comboItems: undefined,
-    displayField: 'value',
-    valueField: 'key',
-    queryMode: 'local',
-
-    // overide framework function to implement deleteEmpty behaviour
-    getSubmitData: function() {
-        var me = this,
-            data = null,
-            val;
-        if (!me.disabled && me.submitValue) {
-            val = me.getSubmitValue();
-            if (val !== null && val !== '' && val !== '__default__') {
-                data = {};
-                data[me.getName()] = val;
-            } else if (me.deleteEmpty) {
-                data = {};
-                data['delete'] = me.getName();
-            }
-        }
-        return data;
-    },
-
-    validator: function(val) {
-       var me = this;
-
-       if (me.editable || val === null || val === '') {
-           return true;
-       }
-
-       if (me.store.getCount() > 0) {
-           var values = me.multiSelect ? val.split(me.delimiter) : [val];
-           var items = me.store.getData().collect('value', 'data');
-           if (Ext.Array.every(values, function(value) {
-               return Ext.Array.contains(items, value);
-           })) {
-               return true;
-           }
-       }
-
-       // returns a boolean or string
-       /*jslint confusion: true */
-       return "value '" + val + "' not allowed!";
-    },
-
-    initComponent: function() {
-       var me = this;
-
-       me.store = Ext.create('Ext.data.ArrayStore', {
-           model: 'KeyValue',
-           data : me.comboItems
-       });
-
-       if (me.initialConfig.editable === undefined) {
-           me.editable = false;
-       }
-
-       me.callParent();
-    }
-});
index c5e8656b40b4091ce7e3a6b21f6bd487ce334ea1..9f1c7d55360c515e36322b461ca7c497fcaf3593 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.NetworkCardSelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: 'widget.pveNetworkCardSelector',
     comboItems: [
        ['e1000', 'Intel E1000'],
index faa70e57aa4c313a1e671b43c76fc8859c3b4c90..74ecc8d25868b6bbe880506d695026d6841064d2 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.QemuBiosSelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.pveQemuBiosSelector'],
 
     initComponent: function() {
index c681b571dc1827568fbc0817825a3b12f4658ed0..f733a011517400f79cb2dcd533a3b92b875b43ca 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.ScsiHwSelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.pveScsiHwSelector'],
     comboItems: [
        ['__default__', PVE.Utils.render_scsihw('')],
index ffc1911c30a0878dee119fcf0935bd838b434636..5758438f0fb578f2206ea56436d546d2d86a717b 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.VNCKeyboardSelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.VNCKeyboardSelector'],
     comboItems: PVE.Utils.kvm_keymap_array()
 });
index ca1de9fb8374330d688ce886764cfefd51eb0be5..9a87bea9b68896aeb9fe284083c458f08d5d753a 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.iScsiProviderSelector', {
-    extend: 'PVE.form.KVComboBox',
+    extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.pveiScsiProviderSelector'],
     comboItems: [
        ['comstar', 'Comstar'],
index 532c28658a7d2024d7c81ce625401cd695035f53..64f3d21ca1cc06df63c54193686abc0126ef7479 100644 (file)
@@ -90,7 +90,7 @@ Ext.define('PVE.FirewallOptions', {
                    subject: name,
                    fieldDefaults: { labelWidth: labelWidth || 100 },
                    items: {
-                       xtype: 'pveKVComboBox',
+                       xtype: 'proxmoxKVComboBox',
                        name: name,
                        fieldLabel: name,
                        comboItems: [['nolog', 'nolog'], ['info', 'info'], ['err', 'err'],
index 22d09dcaef9ea6a035314dc323b41e0c3eedaa3b..ee618d90b082d3b685630d85dd6693e7ebf961a5 100644 (file)
@@ -87,7 +87,7 @@ Ext.define('PVE.FirewallRulePanel', {
                value: ''
            },
            {
-               xtype: 'pveKVComboBox',
+               xtype: 'proxmoxKVComboBox',
                name: 'type',
                value: 'in',
                comboItems: [['in', 'in'], ['out', 'out']],
@@ -95,7 +95,7 @@ Ext.define('PVE.FirewallRulePanel', {
                allowBlank: false
            },
            {
-               xtype: 'pveKVComboBox',
+               xtype: 'proxmoxKVComboBox',
                name: 'action',
                value: 'ACCEPT',
                comboItems: [['ACCEPT', 'ACCEPT'], ['DROP', 'DROP'], ['REJECT', 'REJECT']],
index 6015ffb15c8a8864f1658cd7d529639db056985b..850da7f0555ca4ec1d448975931be4323879e756 100644 (file)
@@ -115,7 +115,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', {
                fieldLabel: gettext('Group')
            },
            {
-               xtype: 'pveKVComboBox',
+               xtype: 'proxmoxKVComboBox',
                name: 'state',
                value: 'started',
                fieldLabel: gettext('Request State'),
index be4814f7742f6f918ee30bdce3fec15eacdf562d..aba3aa0cd758db2ae32f17a0c7d728f94409a258 100644 (file)
@@ -144,7 +144,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
                var name = 'mp' + i.toString();
                names.push([name, name]);
            }
-           me.mpsel = Ext.create('PVE.form.KVComboBox', {
+           me.mpsel = Ext.create('Proxmox.form.KVComboBox', {
                name: 'mpsel',
                fieldLabel: gettext('Mount Point'),
                matchFieldWidth: false,
@@ -180,7 +180,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
        });
 
        if (me.unused) {
-           me.unusedDisks = Ext.create('PVE.form.KVComboBox', {
+           me.unusedDisks = Ext.create('Proxmox.form.KVComboBox', {
                name: 'unusedId',
                fieldLabel: gettext('Disk image'),
                matchFieldWidth: false,
@@ -210,7 +210,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
            });
        }
 
-       me.acl = Ext.createWidget('pveKVComboBox', {
+       me.acl = Ext.createWidget('proxmoxKVComboBox', {
            name: 'acl',
            fieldLabel: 'ACLs',
            comboItems: [['Default', 'Default'], ['1', 'On'], ['0', 'Off']],
index 68a82999a9010a03197ae26a8c61e5d9a2242261..aadce0388ef3b8d752f4772c3020e24c9b671579 100644 (file)
@@ -99,7 +99,7 @@ Ext.define('PVE.lxc.Options', {
                    xtype: 'pveWindowEdit',
                    subject: gettext('Console mode'),
                    items: {
-                       xtype: 'pveKVComboBox',
+                       xtype: 'proxmoxKVComboBox',
                        name: 'cmode',
                        deleteEmpty: true,
                        value: '__default__',
index 3ee2d0ec8e37fe68f3931ddc2005fcfdaa27413d..03c2f1aeb8f586c86f3be82a1dc83bf7bb52072c 100644 (file)
@@ -115,7 +115,7 @@ Ext.define('PVE.qemu.BootOrderPanel', {
        // this has to be done here, because of
        // the way our inputPanel class handles items
        me.comboboxes = [
-               Ext.createWidget('pveKVComboBox', {
+               Ext.createWidget('proxmoxKVComboBox', {
                fieldLabel: gettext('Boot device') + " 1",
                labelWidth: 120,
                name: 'bd1',
@@ -124,7 +124,7 @@ Ext.define('PVE.qemu.BootOrderPanel', {
                    change: me.recomputeSelection
                }
            }),
-               Ext.createWidget('pveKVComboBox', {
+               Ext.createWidget('proxmoxKVComboBox', {
                fieldLabel: gettext('Boot device') + " 2",
                labelWidth: 120,
                name: 'bd2',
@@ -133,7 +133,7 @@ Ext.define('PVE.qemu.BootOrderPanel', {
                    change: me.recomputeSelection
                }
            }),
-               Ext.createWidget('pveKVComboBox', {
+               Ext.createWidget('proxmoxKVComboBox', {
                fieldLabel: gettext('Boot device') + " 3",
                labelWidth: 120,
                name: 'bd3',
index 5b3649d5f9193000bcda50aae9fa7eedab06b7ce..ef202c70a324620ff46f702b7c3b4768117af3f1 100644 (file)
@@ -193,7 +193,7 @@ Ext.define('PVE.window.Clone', {
        );
 
        col2.push({
-           xtype: 'pveKVComboBox',
+           xtype: 'proxmoxKVComboBox',
            fieldLabel: gettext('Mode'),
            name: 'clonemode',
            reference: 'clonemodesel',
index 1b5bb80fba492050f68dc4e18b4d041ac69e6d1d..fa0cc67fa7d0b985f1973106273e032bcc9388d0 100644 (file)
@@ -182,7 +182,7 @@ Ext.define('PVE.qemu.HDInputPanel', {
        }
 
        if (me.unused) {
-           me.unusedDisks = Ext.create('PVE.form.KVComboBox', {
+           me.unusedDisks = Ext.create('Proxmox.form.KVComboBox', {
                name: 'unusedId',
                fieldLabel: gettext('Disk image'),
                matchFieldWidth: false,