]> git.proxmox.com Git - pve-manager.git/commitdiff
use InputPanel from widget toolkit
authorThomas Lamprecht <t.lamprecht@proxmox.com>
Mon, 11 Dec 2017 15:10:13 +0000 (16:10 +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>
39 files changed:
www/manager6/Makefile
www/manager6/dc/ACLView.js
www/manager6/dc/AuthEdit.js
www/manager6/dc/Backup.js
www/manager6/dc/SecurityGroups.js
www/manager6/dc/UserEdit.js
www/manager6/grid/FirewallAliases.js
www/manager6/grid/FirewallRules.js
www/manager6/ha/GroupEdit.js
www/manager6/ha/ResourceEdit.js
www/manager6/lxc/DNS.js
www/manager6/lxc/MPEdit.js
www/manager6/lxc/Network.js
www/manager6/lxc/ResourceEdit.js
www/manager6/panel/IPSet.js
www/manager6/panel/InputPanel.js [deleted file]
www/manager6/qemu/BootOrderEdit.js
www/manager6/qemu/CDEdit.js
www/manager6/qemu/CPUOptions.js
www/manager6/qemu/HDEdit.js
www/manager6/qemu/HDEfi.js
www/manager6/qemu/HDThrottle.js
www/manager6/qemu/MemoryEdit.js
www/manager6/qemu/NetworkEdit.js
www/manager6/qemu/OSTypeEdit.js
www/manager6/qemu/ProcessorEdit.js
www/manager6/qemu/Smbios1Edit.js
www/manager6/qemu/USBEdit.js
www/manager6/storage/DirEdit.js
www/manager6/storage/GlusterFsEdit.js
www/manager6/storage/IScsiEdit.js
www/manager6/storage/LVMEdit.js
www/manager6/storage/LvmThinEdit.js
www/manager6/storage/NFSEdit.js
www/manager6/storage/RBDEdit.js
www/manager6/storage/SheepdogEdit.js
www/manager6/storage/ZFSEdit.js
www/manager6/storage/ZFSPoolEdit.js
www/manager6/window/StartupEdit.js

index 02e833599e7bd201afc7ca3315482e8380b4e8e9..aec626130d46e785cf0c471204a7600227f189e2 100644 (file)
@@ -67,7 +67,6 @@ JSSRC=                                                        \
        panel/RunningChart.js                           \
        panel/InfoWidget.js                             \
        panel/TemplateStatusView.js                     \
-       panel/InputPanel.js                             \
        panel/HealthWidget.js                           \
        window/LoginWindow.js                           \
        window/Wizard.js                                \
index 338b4c53a0ba4994bcf19f4beb0f9d1605c7d1f4..e12c83f20c2574ecc3b1499e90a894d8b2ebff24 100644 (file)
@@ -55,7 +55,7 @@ Ext.define('PVE.dc.ACLAdd', {
            });
        }
 
-       var ipanel = Ext.create('PVE.panel.InputPanel', {
+       var ipanel = Ext.create('Proxmox.panel.InputPanel', {
            items: items,
            onlineHelp: 'pveum_permission_management'
        });
index 4b41ea0a2c3d075b5ab097f9dc2794425543139e..fa926ad6903214034d82f4efd8772c9810243cac 100644 (file)
@@ -190,7 +190,7 @@ Ext.define('PVE.dc.AuthEdit', {
             fieldLabel: 'Yubico URL'
         });
 
-       var ipanel = Ext.create('PVE.panel.InputPanel', {
+       var ipanel = Ext.create('Proxmox.panel.InputPanel', {
            column1: column1,
            column2: column2,
            columnB: [{
index 92337852afb075070927412d5af8ad0392a349af..7f1bde9aaa93538e9a83a9f57baaa7de7a28397a 100644 (file)
@@ -193,7 +193,7 @@ Ext.define('PVE.dc.BackupEdit', {
        ];
        /*jslint confusion: false*/
 
-       var ipanel = Ext.create('PVE.panel.InputPanel', {
+       var ipanel = Ext.create('Proxmox.panel.InputPanel', {
            onlineHelp: 'chapter_vzdump',
            column1: column1,
            column2:  column2,
index 6e47cdc2452bc3c29a9554e5436e34f46cbd20df..33d640c54cf201f999a3e9a70809a9e4c048fb73 100644 (file)
@@ -49,7 +49,7 @@ Ext.define('PVE.SecurityGroupEdit', {
            });
         }
 
-       var ipanel = Ext.create('PVE.panel.InputPanel', {
+       var ipanel = Ext.create('Proxmox.panel.InputPanel', {
        // InputPanel does not have a 'create' property, does it need a 'isCreate'
            isCreate: me.isCreate,
            items: items 
index 4b4671041d45dd897e658405dd5108e474642ff9..d46d046539fb90e60a88d331df1306e102ff5b74 100644 (file)
@@ -151,7 +151,7 @@ Ext.define('PVE.dc.UserEdit', {
             });
         }
 
-       var ipanel = Ext.create('PVE.panel.InputPanel', {
+       var ipanel = Ext.create('Proxmox.panel.InputPanel', {
            column1: column1,
            column2: column2,
            columnB: columnB,
index 46bbced6477e57efb4a8445fa227de63c00b34fd..d0be5e7bd4ae8aacd0ae4dbae65c12910f767069 100644 (file)
@@ -39,7 +39,7 @@ Ext.define('PVE.FirewallAliasEdit', {
            }
        ];
 
-       var ipanel = Ext.create('PVE.panel.InputPanel', {
+       var ipanel = Ext.create('Proxmox.panel.InputPanel', {
            isCreate: me.isCreate,
            items: items
        });
index 55585ee3fbe713f62ecf0a3ea13f576952d04eae..85b30371bd2892b03349963ac66e4f45a8f91bb5 100644 (file)
@@ -47,7 +47,7 @@ Ext.define('PVE.form.FWMacroSelector', {
 });
 
 Ext.define('PVE.FirewallRulePanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
 
     allow_iface: false,
 
@@ -332,7 +332,7 @@ Ext.define('PVE.FirewallGroupRuleEdit', {
            });
        }
 
-       var ipanel = Ext.create('PVE.panel.InputPanel', {
+       var ipanel = Ext.create('Proxmox.panel.InputPanel', {
            isCreate: me.isCreate,
            column1: column1,
            column2: [
index 4570b6a298100bc8fccc598fef989a65e7be05f4..3a879f8d6e71245af24f5a28834312c0a6386f9e 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.ha.GroupInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     onlineHelp: 'ha_manager_groups',
 
     groupId: undefined,
index 4feb8c11f20e432cdaa3304faccdff425fcee803..41718beda128cbfeae9956e7321b99c24e30f75c 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.ha.VMResourceInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     onlineHelp: 'ha_manager_resource_config',
     vmid: undefined,
     
index 5d1eb93982a0ee788c765faa568d2dcc114f8928..512cbf9d8fa13dc00dea7e8d860978c659b92d22 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.lxc.DNSInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveLxcDNSInputPanel',
 
     insideWizard: false,
index 6a7e8a99b4ed0117149737808408aee85c26adb1..827869e8ce9e9b9ba58e60011a3af9fe97515356 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.lxc.MountPointInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveLxcMountPointInputPanel',
 
     insideWizard: false,
index f7ca8e73554d56c8ff89fee907e288282e7ac676..1b574239a9f2360988ac07e8b44161f156c5aa6a 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.lxc.NetworkInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveLxcNetworkInputPanel',
 
     insideWizard: false,
index 68d785a6f9a0becea1ac06d2e2a3bb5beb341382..5feabceaf786fde5044881b6c620ac7b600d6fc8 100644 (file)
@@ -37,7 +37,7 @@ Ext.define('PVE.lxc.CPUEdit', {
 });
 
 Ext.define('PVE.lxc.CPUInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveLxcCPUInputPanel',
 
     onlineHelp: 'pct_cpu',
@@ -108,7 +108,7 @@ Ext.define('PVE.lxc.CPUInputPanel', {
 });
 
 Ext.define('PVE.lxc.MemoryInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveLxcMemoryInputPanel',
 
     onlineHelp: 'pct_memory',
index 47c08d77a5b4427b6476c53ad24759ed0df5b47d..9a08160aa6c5e174804d0af6b4717f3e3bded3eb 100644 (file)
@@ -208,7 +208,7 @@ Ext.define('PVE.IPSetCidrEdit', {
            });
        }
 
-       var ipanel = Ext.create('PVE.panel.InputPanel', {
+       var ipanel = Ext.create('Proxmox.panel.InputPanel', {
            isCreate: me.isCreate,
            column1: column1,
            column2: [
diff --git a/www/manager6/panel/InputPanel.js b/www/manager6/panel/InputPanel.js
deleted file mode 100644 (file)
index 422537c..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-Ext.define('PVE.panel.InputPanel', {
-    extend: 'Ext.panel.Panel',
-    alias: ['widget.inputpanel'],
-    listeners: {
-       activate: function() {
-           // notify owning container that it should display a help button
-           if (this.onlineHelp) {
-               Ext.GlobalEvents.fireEvent('pveShowHelp', this.onlineHelp);
-           }
-       },
-       deactivate: function() {
-           if (this.onlineHelp) {
-               Ext.GlobalEvents.fireEvent('pveHideHelp', this.onlineHelp);
-           }
-       }
-    },
-    border: false,
-
-    // override this with an URL to a relevant chapter of the pve manual
-    // setting this will display a help button in our parent panel
-    onlineHelp: undefined,
-
-    // overwrite this to modify submit data
-    onGetValues: function(values) {
-       return values;
-    },
-
-    getValues: function(dirtyOnly) {
-       var me = this;
-
-       if (Ext.isFunction(me.onGetValues)) {
-           dirtyOnly = false;
-       }
-
-       var values = {};
-
-       Ext.Array.each(me.query('[isFormField]'), function(field) {
-            if (!dirtyOnly || field.isDirty()) {
-                Proxmox.Utils.assemble_field_data(values, field.getSubmitData());
-           }
-       });
-
-       return me.onGetValues(values);
-    },
-
-    setValues: function(values) {
-       var me = this;
-
-       var form = me.up('form');
-
-        Ext.iterate(values, function(fieldId, val) {
-           var field = me.query('[isFormField][name=' + fieldId + ']')[0];
-            if (field) {
-               field.setValue(val);
-                if (form.trackResetOnLoad) {
-                    field.resetOriginalValue();
-                }
-            }
-       });
-    },
-
-    initComponent: function() {
-       var me = this;
-
-       var items;
-       
-       if (me.items) {
-           me.columns = 1;
-           items = [
-               {
-                   columnWidth: 1,
-                   layout: 'anchor',
-                   items: me.items
-               }
-           ];
-           me.items = undefined;
-       } else if (me.column1) {
-           me.columns = 2;
-           items = [
-               {
-                   columnWidth: 0.5,
-                   padding: '0 10 0 0',
-                   layout: 'anchor',
-                   items: me.column1
-               },
-               {
-                   columnWidth: 0.5,
-                   padding: '0 0 0 10',
-                   layout: 'anchor',
-                   items: me.column2 || [] // allow empty column
-               }
-           ];
-           if (me.columnB) {
-               items.push({
-                   columnWidth: 1,
-                   padding: '10 0 0 0',
-                   layout: 'anchor',
-                   items: me.columnB
-               });
-           }
-       } else {
-           throw "unsupported config";
-       }
-
-       if (me.useFieldContainer) {
-           Ext.apply(me, {
-               layout: 'fit',
-               items: Ext.apply(me.useFieldContainer, { 
-                   layout: 'column',
-                   defaultType: 'container',
-                   items: items
-               })
-           });
-       } else {
-           Ext.apply(me, {
-               layout: 'column',
-               defaultType: 'container',
-               items: items
-           });
-       }
-       
-       me.callParent();
-    }
-});
index 4c12bfb680a32c8466bdcac317bc2a92ca9a548c..19d5d50ab2232014a5dfe8839e11ee4a5626790f 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.qemu.BootOrderPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveQemuBootOrderPanel',
     vmconfig: {}, // store loaded vm config
 
index 8b6e944c91ec6d565b527677c613e3e488eb0cb5..925b3e8ded49bec591e9daaf5bdc6a3b000fe668 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.qemu.CDInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveQemuCDInputPanel',
 
     insideWizard: false,
index aa5684da5884e9c072b3735221c640aa28bcc156..a2ef45ffd779c2d27ef322a6590bdfad781ad13f 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.qemu.CPUOptionsInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.PVE.qemu.CPUOptionsInputPanel',
 
     onGetValues: function(values) {
index 73f51cd29fdac8939540bbe1259f83d4c26e4f03..f9a38f21fbb5ca005b6641a4308a1428391bbd5d 100644 (file)
@@ -1,7 +1,7 @@
 /*jslint confusion: true */
 /* 'change' property is assigned a string and then a function */
 Ext.define('PVE.qemu.HDInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveQemuHDInputPanel',
     onlineHelp: 'qm_hard_disk',
 
index f228e849096b85ee0a986c94e1003a9d2972960c..3820078d41dc21c36a00ad2c412bd0ce74e32a5e 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.qemu.EFIDiskInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveEFIDiskInputPanel',
 
     insideWizard: false,
index 3a63f8989045917aa9273c89ac4524cede38e18f..11c1edbc5457af93fc741520bd68575148af2b3d 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.qemu.HDThrottleInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.PVE.qemu.HDThrottleInputPanel',
 
     insideWizard: false,
index 9c979e2475932bbb7dabe7d96af93547babd4a41..c6aaf0db3ec02501e76ee084b1f617c5e43d9f73 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.qemu.MemoryInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveQemuMemoryPanel',
     onlineHelp: 'qm_memory',
 
index 3f591409ff27ee3e4dbfd332d951b21c66eb1b27..bc6d60188d2908904aa843e95973219a7d843afa 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.qemu.NetworkInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveQemuNetworkInputPanel',
     onlineHelp: 'qm_network_device',
 
index eb33c98b83e18fe14335cc432e0da8cb33ba5146..b0901704a17457ef487050de5f0a5a718d00dc04 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.qemu.OSTypeInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveQemuOSTypePanel',
     onlineHelp: 'qm_os_settings',
     insideWizard: false,
index 6ad4fc0015755c38f6337422892c8bbe77b2c5e0..efb70467674205fabedc7f81dd6ba9c7154dc2fa 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.qemu.ProcessorInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveQemuProcessorPanel',
     onlineHelp: 'qm_cpu',
 
index 31ea45589ecbe32ed320af074f2c6566397aa447..fdb0d150b7ca3b4af92e0d2f247f141cac95c966 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.qemu.Smbios1InputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.PVE.qemu.Smbios1InputPanel',
 
     insideWizard: false,
index cf1ec42797fbed92e7e23cd9a72f685087d47f9a..1ca8a0ebad0784c740ba952194e1abb1a774cb5c 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.qemu.USBInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
 
     autoComplete: false,
     onlineHelp: 'qm_usb_passthrough',
index fff6f21349eda7b72508be6b75ec59afc467e4e6..f17a3689d4a3f7999082d06782ca24cde08c6f62 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.storage.DirInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     controller: 'storageEdit',
 
     onGetValues: function(values) {
index 5b2e02bfd89211908ab628830c5cb27e878299f3..11ff32239b740e6bb4fef1ab39d64b38b0d9540b 100644 (file)
@@ -58,7 +58,7 @@ Ext.define('PVE.storage.GlusterFsScan', {
 });
 
 Ext.define('PVE.storage.GlusterFsInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     controller: 'storageEdit',
 
     onGetValues: function(values) {
index 1cc22353d230cf87fad64d620dbdbb0015a66202..b673bc3ab6df003f95f8703d4d3931dd39c1b57a 100644 (file)
@@ -57,7 +57,7 @@ Ext.define('PVE.storage.IScsiScan', {
 });
 
 Ext.define('PVE.storage.IScsiInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
 
     onGetValues: function(values) {
        var me = this;
index b1246738afd0db0ad410e4bd95ae0b6d05e384b0..b822d226752395048afd33bba034448977172bea 100644 (file)
@@ -84,7 +84,7 @@ Ext.define('PVE.storage.BaseStorageSelector', {
 });
 
 Ext.define('PVE.storage.LVMInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
 
     onGetValues: function(values) {
        var me = this;
index 5379fb837a0bc330cd35f2f4a823b24a16b3d219..bb9a4f1e21bb8e3bf61e82ca2519f13dc6e2e615 100644 (file)
@@ -92,7 +92,7 @@ Ext.define('PVE.storage.BaseVGSelector', {
 });
 
 Ext.define('PVE.storage.LvmThinInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
 
     onGetValues: function(values) {
        var me = this;
index 63a5fb8d10e38f051c7c89f00ca76e82a9eca8cb..b230ec345c7c432e9c70f35e4cad40a7b9f62fdc 100644 (file)
@@ -58,7 +58,7 @@ Ext.define('PVE.storage.NFSScan', {
 });
 
 Ext.define('PVE.storage.NFSInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     controller: 'storageEdit',
 
     onGetValues: function(values) {
index aff23ddefc506449f639d8e5f7311c8257a4ee25..1e46f9eeb4c88bff49ffd21625eda197b231d2ef 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.storage.RBDInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
 
     onGetValues: function(values) {
        var me = this;
index d8e3674dffe107fb054cba7f26f2a2ac98e5af77..90d873375093fd3a408c47723c7ad7cd5ed00e4b 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.storage.SheepdogInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
 
     onGetValues: function(values) {
        var me = this;
index c37a73355da87812339b360f8c624057eb62fef9..ac85b3590fa996f68c28768f59b9927c0777917d 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.storage.ZFSInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
 
     onGetValues: function(values) {
        var me = this;
index 5974ecfa36e35781e89fa290e7d8761837ce4be9..56ed0f84c369c0cc8fff944f460878d2f6bb4653 100644 (file)
@@ -35,7 +35,7 @@ Ext.define('PVE.storage.ZFSPoolSelector', {
 });
 
 Ext.define('PVE.storage.ZFSPoolInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
 
     onGetValues: function(values) {
        var me = this;
index dd3ab253b9b44148de7cb4741d1a959a2b498ccc..82bf8d3921bed5feba3c9d7d635eac5af4fbf0f5 100644 (file)
@@ -1,5 +1,5 @@
 Ext.define('PVE.panel.StartupInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     onlineHelp: 'qm_startup_and_shutdown',
 
     onGetValues: function(values) {