diff --git a/www/manager6/form/Boolean.js b/www/manager6/form/Boolean.js index f4f2c4a30..37f794bf0 100644 --- a/www/manager6/form/Boolean.js +++ b/www/manager6/form/Boolean.js @@ -2,16 +2,9 @@ Ext.define('PVE.form.Boolean', { extend: 'PVE.form.KVComboBox', alias: ['widget.booleanfield'], - - initComponent: function() { - var me = this; - - me.data = [ - ['__default__', gettext('Default')], - [1, gettext('Yes')], - [0, gettext('No')] - ]; - - me.callParent(); - } + comboItems: [ + ['__default__', gettext('Default')], + [1, gettext('Yes')], + [0, gettext('No')] + ] }); diff --git a/www/manager6/form/BusTypeSelector.js b/www/manager6/form/BusTypeSelector.js index 00f828193..acb8f7460 100644 --- a/www/manager6/form/BusTypeSelector.js +++ b/www/manager6/form/BusTypeSelector.js @@ -9,14 +9,14 @@ Ext.define('PVE.form.BusTypeSelector', { initComponent: function() { var me = this; - me.data = [['ide', 'IDE'], ['sata', 'SATA']]; + me.comboItems = [['ide', 'IDE'], ['sata', 'SATA']]; if (!me.noVirtIO) { - me.data.push(['virtio', 'VIRTIO']); + me.comboItems.push(['virtio', 'VIRTIO']); } if (!me.noScsi) { - me.data.push(['scsi', 'SCSI']); + me.comboItems.push(['scsi', 'SCSI']); } me.callParent(); diff --git a/www/manager6/form/CPUModelSelector.js b/www/manager6/form/CPUModelSelector.js index 5b84e2b0c..39958745b 100644 --- a/www/manager6/form/CPUModelSelector.js +++ b/www/manager6/form/CPUModelSelector.js @@ -1,40 +1,33 @@ Ext.define('PVE.form.CPUModelSelector', { extend: 'PVE.form.KVComboBox', alias: ['widget.CPUModelSelector'], - - initComponent: function() { - var me = this; - - me.data = [ - ['__default__', PVE.Utils.defaultText + ' (kvm64)'], - ['486', '486'], - ['athlon', 'athlon'], - ['core2duo', 'core2duo'], - ['coreduo', 'coreduo'], - ['kvm32', 'kvm32'], - ['kvm64', 'kvm64'], - ['pentium', 'pentium'], - ['pentium2', 'pentium2'], - ['pentium3', 'pentium3'], - ['phenom', 'phenom'], - ['qemu32', 'qemu32'], - ['qemu64', 'qemu64'], - ['Conroe', 'Conroe'], - ['Penryn', 'Penryn'], - ['Nehalem', 'Nehalem'], - ['Westmere', 'Westmere'], - ['SandyBridge', 'SandyBridge'], - ['IvyBridge', 'IvyBridge'], - ['Haswell', 'Haswell'], - ['Broadwell', 'Broadwell'], - ['Opteron_G1', 'Opteron_G1'], - ['Opteron_G2', 'Opteron_G2'], - ['Opteron_G3', 'Opteron_G3'], - ['Opteron_G4', 'Opteron_G4'], - ['Opteron_G5', 'Opteron_G5'], - ['host', 'host'] - ]; - - me.callParent(); - } + comboItems: [ + ['__default__', PVE.Utils.defaultText + ' (kvm64)'], + ['486', '486'], + ['athlon', 'athlon'], + ['core2duo', 'core2duo'], + ['coreduo', 'coreduo'], + ['kvm32', 'kvm32'], + ['kvm64', 'kvm64'], + ['pentium', 'pentium'], + ['pentium2', 'pentium2'], + ['pentium3', 'pentium3'], + ['phenom', 'phenom'], + ['qemu32', 'qemu32'], + ['qemu64', 'qemu64'], + ['Conroe', 'Conroe'], + ['Penryn', 'Penryn'], + ['Nehalem', 'Nehalem'], + ['Westmere', 'Westmere'], + ['SandyBridge', 'SandyBridge'], + ['IvyBridge', 'IvyBridge'], + ['Haswell', 'Haswell'], + ['Broadwell', 'Broadwell'], + ['Opteron_G1', 'Opteron_G1'], + ['Opteron_G2', 'Opteron_G2'], + ['Opteron_G3', 'Opteron_G3'], + ['Opteron_G4', 'Opteron_G4'], + ['Opteron_G5', 'Opteron_G5'], + ['host', 'host'] + ] }); diff --git a/www/manager6/form/CacheTypeSelector.js b/www/manager6/form/CacheTypeSelector.js index 40a7e8437..f9d39bf80 100644 --- a/www/manager6/form/CacheTypeSelector.js +++ b/www/manager6/form/CacheTypeSelector.js @@ -1,19 +1,12 @@ Ext.define('PVE.form.CacheTypeSelector', { extend: 'PVE.form.KVComboBox', alias: ['widget.CacheTypeSelector'], - - initComponent: function() { - var me = this; - - me.data = [ - ['__default__', PVE.Utils.defaultText + " (" + gettext('No cache') + ")"], - ['directsync', 'Direct sync'], - ['writethrough', 'Write through'], - ['writeback', 'Write back'], - ['unsafe', 'Write back (' + gettext('unsafe') + ')'], - ['none', gettext('No cache')] - ]; - - me.callParent(); - } + comboItems: [ + ['__default__', PVE.Utils.defaultText + " (" + gettext('No cache') + ")"], + ['directsync', 'Direct sync'], + ['writethrough', 'Write through'], + ['writeback', 'Write back'], + ['unsafe', 'Write back (' + gettext('unsafe') + ')'], + ['none', gettext('No cache')] + ], }); diff --git a/www/manager6/form/ContentTypeSelector.js b/www/manager6/form/ContentTypeSelector.js index 0c74524e5..3c8b4bd1f 100644 --- a/www/manager6/form/ContentTypeSelector.js +++ b/www/manager6/form/ContentTypeSelector.js @@ -7,14 +7,14 @@ Ext.define('PVE.form.ContentTypeSelector', { initComponent: function() { var me = this; - me.data = []; + me.comboItems = []; if (me.cts === undefined) { me.cts = ['images', 'iso', 'vztmpl', 'backup', 'rootdir']; } Ext.Array.each(me.cts, function(ct) { - me.data.push([ct, PVE.Utils.format_content_types(ct)]); + me.comboItem.push([ct, PVE.Utils.format_content_types(ct)]); }); me.callParent(); diff --git a/www/manager6/form/DiskFormatSelector.js b/www/manager6/form/DiskFormatSelector.js index 30de6ec2a..c2a24e541 100644 --- a/www/manager6/form/DiskFormatSelector.js +++ b/www/manager6/form/DiskFormatSelector.js @@ -1,16 +1,9 @@ Ext.define('PVE.form.DiskFormatSelector', { extend: 'PVE.form.KVComboBox', alias: ['widget.PVE.form.DiskFormatSelector'], - - initComponent: function() { - var me = this; - - me.data = [ - ['raw', gettext('Raw disk image') + ' (raw)'], - ['qcow2', gettext('QEMU image format') + ' (qcow2)'], - ['vmdk', gettext('VMware image format') + ' (vmdk)'] - ]; - - me.callParent(); - } + comboItems: [ + ['raw', gettext('Raw disk image') + ' (raw)'], + ['qcow2', gettext('QEMU image format') + ' (qcow2)'], + ['vmdk', gettext('VMware image format') + ' (vmdk)'] + ] }); diff --git a/www/manager6/form/DisplaySelector.js b/www/manager6/form/DisplaySelector.js index 755d05977..d5ab30a27 100644 --- a/www/manager6/form/DisplaySelector.js +++ b/www/manager6/form/DisplaySelector.js @@ -1,11 +1,5 @@ Ext.define('PVE.form.DisplaySelector', { extend: 'PVE.form.KVComboBox', alias: ['widget.DisplaySelector'], - - initComponent: function() { - var me = this; - - me.data = PVE.Utils.kvm_vga_driver_array(); - me.callParent(); - } + comboItems: PVE.Utils.kvm_vga_driver_array() }); diff --git a/www/manager6/form/HotplugFeatureSelector.js b/www/manager6/form/HotplugFeatureSelector.js index e0dac4b7f..2277155ab 100644 --- a/www/manager6/form/HotplugFeatureSelector.js +++ b/www/manager6/form/HotplugFeatureSelector.js @@ -5,6 +5,11 @@ Ext.define('PVE.form.HotplugFeatureSelector', { multiSelect: true, allowBlank: true, deleteEmpty: false, + comboItems: [['disk', gettext('Disk')], + ['network', gettext('Network')], + ['usb', gettext('USB')], + ['memory', gettext('Memory')], + ['cpu', gettext('CPU')]], setValue: function(value, doSelect) { var me = this; @@ -41,17 +46,4 @@ Ext.define('PVE.form.HotplugFeatureSelector', { } return data; }, - - - initComponent: function() { - var me = this; - - me.data = [['disk', gettext('Disk')], - ['network', gettext('Network')], - ['usb', gettext('USB')], - ['memory', gettext('Memory')], - ['cpu', gettext('CPU')]]; - - me.callParent(); - } }); diff --git a/www/manager6/form/NetworkCardSelector.js b/www/manager6/form/NetworkCardSelector.js index 6e5ef935d..94f41a0fe 100644 --- a/www/manager6/form/NetworkCardSelector.js +++ b/www/manager6/form/NetworkCardSelector.js @@ -1,17 +1,10 @@ Ext.define('PVE.form.NetworkCardSelector', { extend: 'PVE.form.KVComboBox', alias: ['widget.PVE.form.NetworkCardSelector'], - - initComponent: function() { - var me = this; - - me.data = [ - ['e1000', 'Intel E1000'], - ['virtio', 'VirtIO (' + gettext('paravirtualized') + ')'], - ['rtl8139', 'Realtek RTL8139'], - ['vmxnet3', 'VMWare vmxnet3'] - ]; - - me.callParent(); - } + comboItems: [ + ['e1000', 'Intel E1000'], + ['virtio', 'VirtIO (' + gettext('paravirtualized') + ')'], + ['rtl8139', 'Realtek RTL8139'], + ['vmxnet3', 'VMWare vmxnet3'] + ] }); diff --git a/www/manager6/form/ScsiHwSelector.js b/www/manager6/form/ScsiHwSelector.js index aafee7d9d..c681b571d 100644 --- a/www/manager6/form/ScsiHwSelector.js +++ b/www/manager6/form/ScsiHwSelector.js @@ -1,20 +1,13 @@ Ext.define('PVE.form.ScsiHwSelector', { extend: 'PVE.form.KVComboBox', alias: ['widget.pveScsiHwSelector'], - - initComponent: function() { - var me = this; - - me.data = [ - ['__default__', PVE.Utils.render_scsihw('')], - ['lsi', PVE.Utils.render_scsihw('lsi')], - ['lsi53c810', PVE.Utils.render_scsihw('lsi53c810')], - ['megasas', PVE.Utils.render_scsihw('megasas')], - ['virtio-scsi-pci', PVE.Utils.render_scsihw('virtio-scsi-pci')], - ['virtio-scsi-single', PVE.Utils.render_scsihw('virtio-scsi-single')], - ['pvscsi', PVE.Utils.render_scsihw('pvscsi')] - ]; - - me.callParent(); - } + comboItems: [ + ['__default__', PVE.Utils.render_scsihw('')], + ['lsi', PVE.Utils.render_scsihw('lsi')], + ['lsi53c810', PVE.Utils.render_scsihw('lsi53c810')], + ['megasas', PVE.Utils.render_scsihw('megasas')], + ['virtio-scsi-pci', PVE.Utils.render_scsihw('virtio-scsi-pci')], + ['virtio-scsi-single', PVE.Utils.render_scsihw('virtio-scsi-single')], + ['pvscsi', PVE.Utils.render_scsihw('pvscsi')] + ] }); diff --git a/www/manager6/form/iScsiProviderSelector.js b/www/manager6/form/iScsiProviderSelector.js index 9ea34a14a..ca1de9fb8 100644 --- a/www/manager6/form/iScsiProviderSelector.js +++ b/www/manager6/form/iScsiProviderSelector.js @@ -1,16 +1,9 @@ Ext.define('PVE.form.iScsiProviderSelector', { extend: 'PVE.form.KVComboBox', alias: ['widget.pveiScsiProviderSelector'], - - initComponent: function() { - var me = this; - - me.data = [ - ['comstar', 'Comstar'], - [ 'istgt', 'istgt'], - [ 'iet', 'IET'] - ]; - - me.callParent(); - } + comboItems: [ + ['comstar', 'Comstar'], + [ 'istgt', 'istgt'], + [ 'iet', 'IET'] + ] });