libs/web: align interface related widgets to changed network model api

diff --git a/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm b/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm
index debfddcc2960d7aefc37f2206bf5bff6e2764262..8e0a6a169051a71e3f8e14a6113cffbd7a1485b2 100644 (file)
--- 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 ee38cadbe92529794575ccb9d561740142abb919..a22b7905b64c585e09b6fb988c71bb8520f8d321 100644 (file)
--- 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 beca1599e8fac717446a33c9700f8cdec7fe4b26..76ea74aca52756542342531b1c00ab0ade459e4e 100644 (file)
--- 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 19e98c0192d63d3820e751826665f64cba7b3950..89389f8bb62aa816af0100850b40163ef22b8fc0 100644 (file)
--- 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 4119ed3e26041dbb0f41a076d64a7373f6d9f885..17239325ec4e5c0bbd0e92695032345c4cce9e7f 100644 (file)
--- 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
                                 %>