Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

ui: usbselector: show product name and enable anyMatch search

Browse Source 
Show "Product (usbid)" instead of only "usbid" for slightly better
UX.

Still allows to only enter a USBID and hit enter, even if the ID is
not in the store (i.e., currently unplugged).

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-09-26 18:05:22 +02:00
parent f9e4976d4b
commit 19fa4ee333
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
www/manager6/form/USBSelector.js
View File

@ -1,14 +1,20 @@
Ext.define('PVE.form.USBSelector', {
extend: 'Proxmox.form.ComboGrid',
alias: ['widget.pveUSBSelector'],
allowBlank: false,
autoSelect: false,
displayField: 'usbid',
anyMatch: true,
displayField: 'product_and_id',
valueField: 'usbid',
editable: true,
validator: function(value) {
var me = this;
if (!value) {
return true; // handled later by allowEmpty in the getErrors call chain
}
value = me.getValue(); // as the valueField is not the displayfield
if (me.type === 'device') {
return (/^[a-f0-9]{4}\:[a-f0-9]{4}$/i).test(value);
} else if (me.type === 'port') {
@ -117,7 +123,16 @@ Ext.define('PVE.form.USBSelector', {
{ name: 'level' , type: 'number' },
{ name: 'class' , type: 'number' },
{ name: 'devnum' , type: 'number' },
{ name: 'busnum' , type: 'number' }
{ name: 'busnum' , type: 'number' },
{
name: 'product_and_id',
type: 'string',
convert: (v, rec) => {
let res = rec.data.product || gettext('Unkown');
res += " (" + rec.data.usbid + ")";
return res;
},
},
]
});
@ -138,7 +153,16 @@ Ext.define('PVE.form.USBSelector', {
{ name: 'level' , type: 'number' },
{ name: 'class' , type: 'number' },
{ name: 'devnum' , type: 'number' },
{ name: 'busnum' , type: 'number' }
{ name: 'busnum' , type: 'number' },
{
name: 'product_and_id',
type: 'string',
convert: (v, rec) => {
let res = rec.data.product || gettext('Unplugged');
res += " (" + rec.data.usbid + ")";
return res;
},
},
]
});
});