mirror of
https://git.proxmox.com/git/pve-manager
synced 2025-05-21 14:40:14 +00:00

As getUSBValue() always added the "usb3" property if the selected device was recognized as USB3. But we can now also pass such a device as USB2 so lift this restriction - which also fixes a bug for USB3 selected devices with the USB3 checkbox set. The solution also avoids the me.down query, which is nice too. Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
201 lines
4.1 KiB
JavaScript
201 lines
4.1 KiB
JavaScript
Ext.define('PVE.qemu.USBInputPanel', {
|
|
extend: 'Proxmox.panel.InputPanel',
|
|
mixins: ['Proxmox.Mixin.CBind' ],
|
|
|
|
autoComplete: false,
|
|
onlineHelp: 'qm_usb_passthrough',
|
|
|
|
viewModel: {
|
|
data: {}
|
|
},
|
|
|
|
controller: {
|
|
xclass: 'Ext.app.ViewController',
|
|
|
|
control: {
|
|
'pveUSBSelector': {
|
|
change: function(field, newValue, oldValue) {
|
|
var usb3field = this.lookupReference('usb3');
|
|
var usbval = field.getUSBValue();
|
|
var dev_is_usb3 = /usb3=1/.test(usbval);
|
|
|
|
if (dev_is_usb3) {
|
|
usb3field.savedVal = usb3field.getValue();
|
|
usb3field.setValue(true);
|
|
} else {
|
|
if (usb3field.savedVal !== undefined) {
|
|
usb3field.setValue(usb3field.savedVal);
|
|
} else {
|
|
usb3field.setValue(usb3field.originalValue);
|
|
}
|
|
usb3field.setDisabled(false);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
|
|
setVMConfig: function(vmconfig) {
|
|
var me = this;
|
|
me.vmconfig = vmconfig;
|
|
},
|
|
|
|
onGetValues: function(values) {
|
|
var me = this;
|
|
if (!me.confid) {
|
|
for (let i = 0; i < 6; i++) {
|
|
let id = 'usb' + i.toString();
|
|
if (!me.vmconfig[id]) {
|
|
me.confid = id;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
var val = "";
|
|
var type = me.down('radiofield').getGroupValue();
|
|
switch (type) {
|
|
case 'spice':
|
|
val = 'spice';
|
|
break;
|
|
case 'hostdevice':
|
|
case 'port':
|
|
val = 'host=' + values[type];
|
|
delete values[type];
|
|
break;
|
|
default:
|
|
throw "invalid type selected";
|
|
}
|
|
|
|
if (values.usb3) {
|
|
delete values.usb3;
|
|
val += ',usb3=1';
|
|
}
|
|
values[me.confid] = val;
|
|
return values;
|
|
},
|
|
|
|
items: [
|
|
{
|
|
xtype: 'fieldcontainer',
|
|
defaultType: 'radiofield',
|
|
items:[
|
|
{
|
|
name: 'usb',
|
|
inputValue: 'spice',
|
|
boxLabel: gettext('Spice Port'),
|
|
submitValue: false,
|
|
checked: true
|
|
},
|
|
{
|
|
name: 'usb',
|
|
inputValue: 'hostdevice',
|
|
boxLabel: gettext('Use USB Vendor/Device ID'),
|
|
reference: 'hostdevice',
|
|
submitValue: false
|
|
},
|
|
{
|
|
xtype: 'pveUSBSelector',
|
|
disabled: true,
|
|
type: 'device',
|
|
name: 'hostdevice',
|
|
cbind: { pveSelNode: '{pveSelNode}' },
|
|
bind: { disabled: '{!hostdevice.checked}' },
|
|
editable: true,
|
|
allowBlank: false,
|
|
fieldLabel: 'Choose Device',
|
|
labelAlign: 'right',
|
|
},
|
|
{
|
|
name: 'usb',
|
|
inputValue: 'port',
|
|
boxLabel: gettext('Use USB Port'),
|
|
reference: 'port',
|
|
submitValue: false
|
|
},
|
|
{
|
|
xtype: 'pveUSBSelector',
|
|
disabled: true,
|
|
name: 'port',
|
|
cbind: { pveSelNode: '{pveSelNode}' },
|
|
bind: { disabled: '{!port.checked}' },
|
|
editable: true,
|
|
type: 'port',
|
|
allowBlank: false,
|
|
fieldLabel: gettext('Choose Port'),
|
|
labelAlign: 'right',
|
|
},
|
|
{
|
|
xtype: 'checkbox',
|
|
name: 'usb3',
|
|
inputValue: true,
|
|
reference: 'usb3',
|
|
fieldLabel: gettext('Use USB3')
|
|
}
|
|
]
|
|
}
|
|
]
|
|
});
|
|
|
|
Ext.define('PVE.qemu.USBEdit', {
|
|
extend: 'Proxmox.window.Edit',
|
|
|
|
vmconfig: undefined,
|
|
|
|
isAdd: true,
|
|
subject: gettext('USB Device'),
|
|
|
|
initComponent : function() {
|
|
var me = this;
|
|
|
|
me.isCreate = !me.confid;
|
|
|
|
var ipanel = Ext.create('PVE.qemu.USBInputPanel', {
|
|
confid: me.confid,
|
|
pveSelNode: me.pveSelNode
|
|
});
|
|
|
|
Ext.apply(me, {
|
|
items: [ ipanel ]
|
|
});
|
|
|
|
me.callParent();
|
|
|
|
me.load({
|
|
success: function(response, options) {
|
|
ipanel.setVMConfig(response.result.data);
|
|
if (me.isCreate) {
|
|
return;
|
|
}
|
|
|
|
var data = response.result.data[me.confid].split(',');
|
|
var port, hostdevice, usb3 = false;
|
|
var type = 'spice';
|
|
|
|
for (let i = 0; i < data.length; i++) {
|
|
if (/^(host=)?(0x)?[a-zA-Z0-9]{4}\:(0x)?[a-zA-Z0-9]{4}$/.test(data[i])) {
|
|
hostdevice = data[i];
|
|
hostdevice = hostdevice.replace('host=', '').replace('0x','');
|
|
type = 'hostdevice';
|
|
} else if (/^(host=)?(\d+)\-(\d+(\.\d+)*)$/.test(data[i])) {
|
|
port = data[i];
|
|
port = port.replace('host=', '');
|
|
type = 'port';
|
|
}
|
|
|
|
if (/^usb3=(1|on|true)$/.test(data[i])) {
|
|
usb3 = true;
|
|
}
|
|
}
|
|
var values = {
|
|
usb : type,
|
|
hostdevice: hostdevice,
|
|
port: port,
|
|
usb3: usb3
|
|
};
|
|
|
|
ipanel.setValues(values);
|
|
}
|
|
});
|
|
}
|
|
});
|