libs/web: network widget fixes

diff --git a/libs/web/luasrc/view/cbi/network_ifacelist.htm b/libs/web/luasrc/view/cbi/network_ifacelist.htm
index 76ea74aca52756542342531b1c00ab0ade459e4e..a6565eb9f593cbe4a0c804e64ca72f2540812374 100644 (file)
--- a/libs/web/luasrc/view/cbi/network_ifacelist.htm
+++ b/libs/web/luasrc/view/cbi/network_ifacelist.htm
@@ -25,7 +25,7 @@
                local n = self.network and net:get_network(self.network)
                if n then
                        local i
-                       for _, i in ipairs(n:is_bridge() and n:get_interfaces() or { n:get_interface() }) do
+                       for _, i in ipairs(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 89389f8bb62aa816af0100850b40163ef22b8fc0..f364ca088bc87fe03002520833d179c8114bbed4 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:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
+                       for _, iface in ipairs(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 17239325ec4e5c0bbd0e92695032345c4cce9e7f..fab7883b2a8ce1162cdc1ad324bf0e3c2ca94e7e 100644 (file)
--- a/libs/web/luasrc/view/cbi/network_netlist.htm
+++ b/libs/web/luasrc/view/cbi/network_netlist.htm
@@ -36,7 +36,7 @@
                                                if not iface:is_bridge() then
                                                        empty = false
                                 %>
-                                       <img<%=attr("title", pcdata(iface:get_i18n()))%> style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
+                                       <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" />
                                <% end end %>
                                <% if empty then %><em><%:(no interfaces attached)%></em><% end %>
                        </span>