From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 14 Jan 2011 19:57:30 +0000 (+0000)
Subject: libs/web: some fixes for network_ifacelist widget
X-Git-Tag: 0.11.0~2372
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=5355d11e2c9716ec16b4bedfc4f137f727d3d968

libs/web: some fixes for network_ifacelist widget
---

diff --git a/libs/web/luasrc/view/cbi/network_ifacelist.htm b/libs/web/luasrc/view/cbi/network_ifacelist.htm
index c4d392e9e..1cedc02b7 100644
--- a/libs/web/luasrc/view/cbi/network_ifacelist.htm
+++ b/libs/web/luasrc/view/cbi/network_ifacelist.htm
@@ -19,7 +19,12 @@ $Id$
 
 	local iface
 	local ifaces = net:get_interfaces()
-	local value = (self:formvalue(section) or self.default)
+	local value = self:formvalue(section)
+
+	if not value or value == "" then
+		value = self:cfgvalue(section) or self.default
+	end
+
 	local checked = { }
 
 	if value then
@@ -46,7 +51,8 @@ $Id$
 			attr("type", self.widget or "radio") ..
 			attr("id", cbid .. "." .. iface:name()) ..
 			attr("name", cbid) .. attr("value", iface:name()) ..
-			ifattr(checked[iface:name()], "checked", "checked")
+			ifattr(checked[iface:name()], "checked", "checked") ..
+			ifattr(iface:type() == "wifi" and not iface:is_up(), "disabled", "disabled")
 		%> /> &nbsp;
 		<label<%=attr("for", cbid .. "." .. iface:name())%>>
 			<% if link then -%><a href="<%=link%>"><% end -%>