summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-mod-network
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2018-10-10 07:49:23 +0200
committerGitHub <noreply@github.com>2018-10-10 07:49:23 +0200
commitc126c7349dccbc516cda23dacd4f14a381c8aa1b (patch)
tree2ff56cc31cd34855108ef69ae0e253d87542c91e /modules/luci-mod-network
parent701f6b0819a902e8c45e19c95aad7121f9c50145 (diff)
parent645a555f391044504886d6fcb5d6235911eb6869 (diff)
Merge pull request #2216 from yangfl/ifacelist
luci-mod-network: show bridges in ifacelist when the interface itself is not a bridge
Diffstat (limited to 'modules/luci-mod-network')
-rw-r--r--modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
index 8be354b448..bff859befa 100644
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
@@ -284,7 +284,7 @@ if not net:is_floating() then
ifname_single = s:taboption("physical", Value, "ifname_single", translate("Interface"))
ifname_single.template = "cbi/network_ifacelist"
ifname_single.widget = "radio"
- ifname_single.nobridges = true
+ ifname_single.nobridges = net:is_bridge()
ifname_single.noaliases = false
ifname_single.rmempty = false
ifname_single.network = arg[1]
@@ -341,7 +341,7 @@ end
if not net:is_virtual() then
ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface"))
ifname_multi.template = "cbi/network_ifacelist"
- ifname_multi.nobridges = true
+ ifname_multi.nobridges = net:is_bridge()
ifname_multi.noaliases = true
ifname_multi.rmempty = false
ifname_multi.network = arg[1]