openwrt-mirror/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2025-12-26 13:26:20 +04:00
Code Issues Packages Projects Releases Wiki Activity

luci-mod-network: rename "device" option to "_net_device" internally

Browse Source 
This is required to resolve conflicts with the existing "device" option
in other proto handlers such as PPP or QMI where "device" refers to the
device path of the tty control device instead of a netdev name.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 10f02472c5)
This commit is contained in:
Jo-Philipp Wich
2021-06-01 15:27:24 +02:00
parent caa0abf99a
commit 56cd1abbe8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
View File

@@ -521,7 +521,8 @@ return view.extend({
.then(L.bind(this.renderMoreOptionsModal, this, s.section));
}, this);
o = s.taboption('general', widgets.DeviceSelect, 'device', _('Device'));
o = s.taboption('general', widgets.DeviceSelect, '_net_device', _('Device'));
o.ucioption = 'device';
o.nobridges = false;
o.optional = false;
o.network = ifc.getName();
@@ -888,7 +889,7 @@ return view.extend({
case 'igmp_snooping':
case 'stp':
case 'type':
case 'device':
case '_net_device':
var deps = [];
for (var j = 0; j < protocols.length; j++) {
if (!protocols[j].isVirtual()) {