[WebUI] Accept network interface name as well as IP address
Deluge & libtorrent actually accept both IP address and device/interface namesgq
as listen_interface: 540d557c
which patched ui/ console & gkt3, but not
web, this fixes it.
(Inspired by https://github.com/deluge-torrent/deluge/pull/300)
(Translation should be ok: this string already exists)
Also, resync listen & outgoing widths: they hold the same data types.
Closes: https://github.com/deluge-torrent/deluge/pull/458
This commit is contained in:
parent
40d4f7efef
commit
8df36c454b
|
@ -6,6 +6,10 @@
|
||||||
|
|
||||||
- Python 3.6 support removed (Python >= 3.7)
|
- Python 3.6 support removed (Python >= 3.7)
|
||||||
|
|
||||||
|
### Web UI
|
||||||
|
|
||||||
|
- Accept network interface name in addition to IP adress in "Incoming Address"
|
||||||
|
|
||||||
## 2.1.1 (2022-07-10)
|
## 2.1.1 (2022-07-10)
|
||||||
|
|
||||||
### Core
|
### Core
|
||||||
|
|
|
@ -9,15 +9,6 @@
|
||||||
*/
|
*/
|
||||||
Ext.namespace('Deluge.preferences');
|
Ext.namespace('Deluge.preferences');
|
||||||
|
|
||||||
// custom Vtype for vtype:'IPAddress'
|
|
||||||
Ext.apply(Ext.form.VTypes, {
|
|
||||||
IPAddress: function (v) {
|
|
||||||
return /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(v);
|
|
||||||
},
|
|
||||||
IPAddressText: 'Must be a numeric IP address',
|
|
||||||
IPAddressMask: /[\d\.]/i,
|
|
||||||
});
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @class Deluge.preferences.Network
|
* @class Deluge.preferences.Network
|
||||||
* @extends Ext.form.FormPanel
|
* @extends Ext.form.FormPanel
|
||||||
|
@ -35,7 +26,7 @@ Deluge.preferences.Network = Ext.extend(Ext.form.FormPanel, {
|
||||||
fieldset = this.add({
|
fieldset = this.add({
|
||||||
xtype: 'fieldset',
|
xtype: 'fieldset',
|
||||||
border: false,
|
border: false,
|
||||||
title: _('Incoming Address'),
|
title: _('Incoming Interface'),
|
||||||
style: 'margin-bottom: 5px; padding-bottom: 0px;',
|
style: 'margin-bottom: 5px; padding-bottom: 0px;',
|
||||||
autoHeight: true,
|
autoHeight: true,
|
||||||
labelWidth: 1,
|
labelWidth: 1,
|
||||||
|
@ -48,7 +39,6 @@ Deluge.preferences.Network = Ext.extend(Ext.form.FormPanel, {
|
||||||
fieldLabel: '',
|
fieldLabel: '',
|
||||||
labelSeparator: '',
|
labelSeparator: '',
|
||||||
width: 200,
|
width: 200,
|
||||||
vtype: 'IPAddress',
|
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -110,7 +100,7 @@ Deluge.preferences.Network = Ext.extend(Ext.form.FormPanel, {
|
||||||
name: 'outgoing_interface',
|
name: 'outgoing_interface',
|
||||||
fieldLabel: '',
|
fieldLabel: '',
|
||||||
labelSeparator: '',
|
labelSeparator: '',
|
||||||
width: 40,
|
width: 200,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue