Signed-off-by: Dominik Csapak <d.csa...@proxmox.com>
---
www/manager6/qemu/HDEdit.js | 84 ++++-----------------------------------------
1 file changed, 6 insertions(+), 78 deletions(-)
diff --git a/www/manager6/qemu/HDEdit.js b/www/manager6/qemu/HDEdit.js
index 8f5c9dbe..aeac7dd0 100644
--- a/www/manager6/qemu/HDEdit.js
+++ b/www/manager6/qemu/HDEdit.js
@@ -24,44 +24,6 @@ Ext.define('PVE.qemu.HDInputPanel', {
'field[name=controller]': {
change: 'onControllerChange',
afterrender: 'onControllerChange'
- },
- 'field[name=hdstorage]': {
- change: function(f, value) {
- if (!value) { // initial store loading fires an unwanted
'change'
- return;
- }
- var me = this.getView();
- var rec = f.store.getById(value);
- if (rec.data.type === 'iscsi') {
- me.hdfilesel.setStorage(value);
- me.hdfilesel.setDisabled(false);
- me.formatsel.setValue('raw');
- me.formatsel.setDisabled(true);
- me.hdfilesel.setVisible(true);
- me.hdsizesel.setDisabled(true);
- me.hdsizesel.setVisible(false);
- } else if (rec.data.type === 'lvm' ||
- rec.data.type === 'lvmthin' ||
- rec.data.type === 'drbd' ||
- rec.data.type === 'rbd' ||
- rec.data.type === 'sheepdog' ||
- rec.data.type === 'zfs' ||
- rec.data.type === 'zfspool') {
- me.hdfilesel.setDisabled(true);
- me.hdfilesel.setVisible(false);
- me.formatsel.setValue('raw');
- me.formatsel.setDisabled(true);
- me.hdsizesel.setDisabled(false);
- me.hdsizesel.setVisible(true);
- } else {
- me.hdfilesel.setDisabled(true);
- me.hdfilesel.setVisible(false);
- me.formatsel.setValue('qcow2');
- me.formatsel.setDisabled(false);
- me.hdsizesel.setDisabled(false);
- me.hdsizesel.setVisible(true);
- }
- }
}
}
},
@@ -164,8 +126,8 @@ Ext.define('PVE.qemu.HDInputPanel', {
setNodename: function(nodename) {
var me = this;
- me.hdstoragesel.setNodename(nodename);
- me.hdfilesel.setStorage(undefined, nodename);
+ me.down('#hdstorage').setNodename(nodename);
+ me.down('#hdimage').setStorage(undefined, nodename);
},
initComponent : function() {
@@ -196,46 +158,12 @@ Ext.define('PVE.qemu.HDInputPanel', {
});
me.column1.push(me.unusedDisks);
} else if (me.isCreate) {
- me.formatsel = Ext.create('PVE.form.DiskFormatSelector', {
- name: 'diskformat',
- fieldLabel: gettext('Format'),
- value: 'qcow2',
- allowBlank: false
- });
-
- me.hdfilesel = Ext.create('PVE.form.FileSelector', {
- name: 'hdimage',
- nodename: me.nodename,
- storageContent: 'images',
- fieldLabel: gettext('Disk image'),
- disabled: true,
- hidden: true,
- allowBlank: false
- });
-
- me.hdsizesel = Ext.createWidget('numberfield', {
- name: 'disksize',
- minValue: 0.001,
- maxValue: 128*1024,
- decimalPrecision: 3,
- value: '32',
- fieldLabel: gettext('Disk size') + ' (GB)',
- allowBlank: false
- });
-
- me.hdstoragesel = Ext.create('PVE.form.StorageSelector', {
- name: 'hdstorage',
+ me.column1.push({
+ xtype: 'pveDiskStorageSelector',
+ name: 'disk',
nodename: me.nodename,
- fieldLabel: gettext('Storage'),
- storageContent: 'images',
- autoSelect: me.insideWizard,
- allowBlank: false
+ autoSelect: me.insideWizard
});
- me.column1.push(me.hdstoragesel);
- me.column1.push(me.hdfilesel);
- me.column1.push(me.hdsizesel);
- me.column1.push(me.formatsel);
-
} else {
me.column1.push({
xtype: 'textfield',
--
2.11.0
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
