adapt KVComboBoxes to pass store items using 'comboItems' parameter

we used a custom 'data' property to pass around the items to
add to the store, but this property is now used by ExtJS to
store content for the component template

also move to declarative style, saves lines
This commit is contained in:
Emmanuel Kasper 2016-03-03 14:43:21 +01:00 committed by Dietmar Maurer
parent c3bf50ab2d
commit 548b29644d
11 changed files with 78 additions and 141 deletions

@ -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')]
]
});

@ -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();

@ -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']
]
});

@ -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')]
],
});

@ -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();

@ -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)']
]
});

@ -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()
});

@ -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();
}
});

@ -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']
]
});

@ -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')]
]
});

@ -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']
]
});