Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2216 from yangfl/ifacelist

Browse source 
luci-mod-network: show bridges in ifacelist when the interface itself is not a bridge
This commit is contained in:
Jo-Philipp Wich 2018-10-10 07:49:23 +02:00 committed by GitHub
commit c126c7349d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
View file

@ -284,7 +284,7 @@ if not net:is_floating() then
ifname_single = s:taboption("physical", Value, "ifname_single", translate("Interface")) ifname_single = s:taboption("physical", Value, "ifname_single", translate("Interface"))
ifname_single.template = "cbi/network_ifacelist" ifname_single.template = "cbi/network_ifacelist"
ifname_single.widget = "radio" ifname_single.widget = "radio"
ifname_single.nobridges = true ifname_single.nobridges = net:is_bridge()
ifname_single.noaliases = false ifname_single.noaliases = false
ifname_single.rmempty = false ifname_single.rmempty = false
ifname_single.network = arg[1] ifname_single.network = arg[1]
@ -341,7 +341,7 @@ end
if not net:is_virtual() then if not net:is_virtual() then
ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface")) ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface"))
ifname_multi.template = "cbi/network_ifacelist" ifname_multi.template = "cbi/network_ifacelist"
ifname_multi.nobridges = true ifname_multi.nobridges = net:is_bridge()
ifname_multi.noaliases = true ifname_multi.noaliases = true
ifname_multi.rmempty = false ifname_multi.rmempty = false
ifname_multi.network = arg[1] ifname_multi.network = arg[1]