X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fweb%2Fluasrc%2Fview%2Fcbi%2Fnetwork_ifacelist.htm;h=643d849a5071f002808437ebf6297fc54f005aac;hp=beca1599e8fac717446a33c9700f8cdec7fe4b26;hb=bbb44cf245c11bc0c1d59e836007c9e8c3bfa209;hpb=59e95ddcadf5caac70d6f6228bf0c519297cc551

diff --git a/libs/web/luasrc/view/cbi/network_ifacelist.htm b/libs/web/luasrc/view/cbi/network_ifacelist.htm
index beca1599e..643d849a5 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:get_interfaces() or { n:get_interface() }) do
 				checked[i:name()] = true
 			end
 		end
@@ -49,9 +49,15 @@
 		%> />  
 		<label<%=attr("for", cbid .. "." .. iface:name())%>>
 			<% if link then -%><a href="<%=link%>"><% end -%>
-			<img title="<%=iface:get_type_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" />
 			<% if link then -%></a><% end -%>
-			<%=pcdata(iface:get_i18n())%><% local n = iface:get_network(); if n then %> (<a href="<%=n:adminlink()%>"><%=n:name()%></a>)<% end %>
+			<%=pcdata(iface:get_i18n())%>
+			<% local ns = iface:get_networks(); if #ns > 0 then %>(
+				<%- local i, n; for i, n in ipairs(ns) do -%>
+					<%-= (i>1) and ', ' -%>
+					<a href="<%=n:adminlink()%>"><%=n:name()%></a>
+				<%- end -%>
+			)<% end %>
 		</label>
 	</li>
 	<% end end %>