summaryrefslogtreecommitdiffhomepage
path: root/libs/web/luasrc/view
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-09-24 03:49:17 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-09-24 03:49:17 +0000
commitbf49f78599a006a9d136d9fd83cecc5d8a5afb1a (patch)
treebba2d61447fc6fa68c8712348b02fc9b5df16e3f /libs/web/luasrc/view
parent575b32de8157dfd8a5857b8fb68325428afe8d7d (diff)
libs/web: align interface related widgets to changed network model api
Diffstat (limited to 'libs/web/luasrc/view')
-rw-r--r--libs/web/luasrc/view/cbi/firewall_zoneforwards.htm2
-rw-r--r--libs/web/luasrc/view/cbi/firewall_zonelist.htm2
-rw-r--r--libs/web/luasrc/view/cbi/network_ifacelist.htm4
-rw-r--r--libs/web/luasrc/view/cbi/network_netinfo.htm2
-rw-r--r--libs/web/luasrc/view/cbi/network_netlist.htm2
5 files changed, 6 insertions, 6 deletions
diff --git a/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm b/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm
index debfddcc29..8e0a6a1690 100644
--- a/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm
+++ b/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm
@@ -35,7 +35,7 @@
<%- end -%>
<%
local nempty = true
- for _, iface in ipairs(net and net:get_interfaces() or {}) do
+ for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
nempty = false
%>
<img<%=attr("title", iface:get_i18n())%> style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
diff --git a/libs/web/luasrc/view/cbi/firewall_zonelist.htm b/libs/web/luasrc/view/cbi/firewall_zonelist.htm
index ee38cadbe9..a22b7905b6 100644
--- a/libs/web/luasrc/view/cbi/firewall_zonelist.htm
+++ b/libs/web/luasrc/view/cbi/firewall_zonelist.htm
@@ -57,7 +57,7 @@
<%- end -%>
<%
local nempty = true
- for _, iface in ipairs(net and net:get_interfaces() or {}) do
+ for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
nempty = false
%>
<img<%=attr("title", iface:get_i18n())%> style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
diff --git a/libs/web/luasrc/view/cbi/network_ifacelist.htm b/libs/web/luasrc/view/cbi/network_ifacelist.htm
index beca1599e8..76ea74aca5 100644
--- a/libs/web/luasrc/view/cbi/network_ifacelist.htm
+++ b/libs/web/luasrc/view/cbi/network_ifacelist.htm
@@ -8,7 +8,7 @@
local iface
local ifaces = net:get_interfaces()
local value
-
+
if self.map:formvalue(cbeid) == "1" then
value = self:formvalue(section) or self.default or ""
else
@@ -25,7 +25,7 @@
local n = self.network and net:get_network(self.network)
if n then
local i
- for _, i in ipairs(n:get_interfaces()) do
+ for _, i in ipairs(n:is_bridge() and n:get_interfaces() or { n:get_interface() }) do
checked[i:name()] = true
end
end
diff --git a/libs/web/luasrc/view/cbi/network_netinfo.htm b/libs/web/luasrc/view/cbi/network_netinfo.htm
index 19e98c0192..89389f8bb6 100644
--- a/libs/web/luasrc/view/cbi/network_netinfo.htm
+++ b/libs/web/luasrc/view/cbi/network_netinfo.htm
@@ -15,7 +15,7 @@
<span style="background-color:#FFFFFF; border:1px solid #CCCCCC; padding:2px"><%=net:name()%>:
<%
local empty = true
- for _, iface in ipairs(net:get_interfaces()) do
+ for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
if not iface:is_bridge() then
empty = false
%>
diff --git a/libs/web/luasrc/view/cbi/network_netlist.htm b/libs/web/luasrc/view/cbi/network_netlist.htm
index 4119ed3e26..17239325ec 100644
--- a/libs/web/luasrc/view/cbi/network_netlist.htm
+++ b/libs/web/luasrc/view/cbi/network_netlist.htm
@@ -32,7 +32,7 @@
&#160;<span style="background-color:#FFFFFF; border:1px solid #CCCCCC; padding:2px"><%=net:name()%>:
<%
local empty = true
- for _, iface in ipairs(net:get_interfaces()) do
+ for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
if not iface:is_bridge() then
empty = false
%>