api: add proxmox-firewall to versions pkg list

[pve-manager.git] / www / manager6 / qemu / CDEdit.js

diff --git a/www/manager6/qemu/CDEdit.js b/www/manager6/qemu/CDEdit.js
index ea76b72042b145a572889f8bb9d4f7834ddd93a3..3cc16205e067d4395a59ede248db3d26cb7eeaff 100644 (file)
--- a/www/manager6/qemu/CDEdit.js
+++ b/www/manager6/qemu/CDEdit.js
@@ -7,7 +7,7 @@ Ext.define('PVE.qemu.CDInputPanel', {
     onGetValues: function(values) {
        var me = this;
 
-       var confid = me.confid || (values.controller + values.deviceid);
+       var confid = me.confid || values.controller + values.deviceid;
 
        me.drive.media = 'cdrom';
        if (values.mediaType === 'iso') {
@@ -43,11 +43,7 @@ Ext.define('PVE.qemu.CDInputPanel', {
            values.mediaType = 'none';
        } else {
            values.mediaType = 'iso';
-           var match = drive.file.match(/^([^:]+):/);
-           if (match) {
-               values.cdstorage = match[1];
-               values.cdimage = drive.file;
-           }
+           values.cdimage = drive.file;
        }
 
        me.drive = drive;
@@ -58,11 +54,10 @@ Ext.define('PVE.qemu.CDInputPanel', {
     setNodename: function(nodename) {
        var me = this;
 
-       me.cdstoragesel.setNodename(nodename);
-       me.cdfilesel.setStorage(undefined, nodename);
+       me.isosel.setNodename(nodename);
     },
 
-    initComponent : function() {
+    initComponent: function() {
        var me = this;
 
        me.drive = {};
@@ -71,7 +66,7 @@ Ext.define('PVE.qemu.CDInputPanel', {
 
        if (!me.confid) {
            me.bussel = Ext.create('PVE.form.ControllerSelector', {
-               noVirtIO: true,
+               withVirtIO: false,
            });
            items.push(me.bussel);
        }
@@ -87,10 +82,9 @@ Ext.define('PVE.qemu.CDInputPanel', {
                    if (!me.rendered) {
                        return;
                    }
-                   me.down('field[name=cdstorage]').setDisabled(!value);
-                   var cdImageField = me.down('field[name=cdimage]');
+                   var cdImageField = me.down('pveIsoSelector');
                    cdImageField.setDisabled(!value);
-                   if(value) {
+                   if (value) {
                        cdImageField.validate();
                    } else {
                        cdImageField.reset();
@@ -99,32 +93,14 @@ Ext.define('PVE.qemu.CDInputPanel', {
            },
        });
 
-       me.cdfilesel = Ext.create('PVE.form.FileSelector', {
-           name: 'cdimage',
-           nodename: me.nodename,
-           storageContent: 'iso',
-           fieldLabel: gettext('ISO image'),
-           labelAlign: 'right',
-           allowBlank: false,
-       });
 
-       me.cdstoragesel = Ext.create('PVE.form.StorageSelector', {
-           name: 'cdstorage',
+       me.isosel = Ext.create('PVE.form.IsoSelector', {
            nodename: me.nodename,
-           fieldLabel: gettext('Storage'),
-           labelAlign: 'right',
-           storageContent: 'iso',
-           allowBlank: false,
-           autoSelect: me.insideWizard,
-           listeners: {
-               change: function(f, value) {
-                   me.cdfilesel.setStorage(value);
-               },
-           },
+           insideWizard: me.insideWizard,
+           name: 'cdimage',
        });
 
-       items.push(me.cdstoragesel);
-       items.push(me.cdfilesel);
+       items.push(me.isosel);
 
        items.push({
            xtype: 'radiofield',
@@ -151,7 +127,7 @@ Ext.define('PVE.qemu.CDEdit', {
 
     width: 400,
 
-    initComponent : function() {
+    initComponent: function() {
        var me = this;
 
        var nodename = me.pveSelNode.data.node;
@@ -159,7 +135,7 @@ Ext.define('PVE.qemu.CDEdit', {
            throw "no node name specified";
        }
 
-       me.isCreate = me.confid ? false : true;
+       me.isCreate = !me.confid;
 
        var ipanel = Ext.create('PVE.qemu.CDInputPanel', {
            confid: me.confid,
@@ -168,13 +144,13 @@ Ext.define('PVE.qemu.CDEdit', {
 
        Ext.applyIf(me, {
            subject: 'CD/DVD Drive',
-           items: [ ipanel ],
+           items: [ipanel],
        });
 
        me.callParent();
 
        me.load({
-           success:  function(response, options) {
+           success: function(response, options) {
                ipanel.setVMConfig(response.result.data);
                if (me.confid) {
                    var value = response.result.data[me.confid];