From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Dec 2010 03:57:29 +0000 (+0000)
Subject: libs/core: always use internal network ids for admin links to wifi networks (#172)
X-Git-Tag: 0.10.0~310
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=5dd3b57bbbe526b2043da2a0c44fd7389af5834d

libs/core: always use internal network ids for admin links to wifi networks (#172)
---

diff --git a/libs/core/luasrc/model/network.lua b/libs/core/luasrc/model/network.lua
index 28237e49a..18c84b624 100644
--- a/libs/core/luasrc/model/network.lua
+++ b/libs/core/luasrc/model/network.lua
@@ -936,21 +936,22 @@ wifinet = utl.class()
 function wifinet.__init__(self, net, data)
 	self.sid = net
 
-	local dev = uci_s:get("wireless", self.sid, "ifname")
-	if not dev then
-		local num = { }
-		uci_r:foreach("wireless", "wifi-iface",
-			function(s)
-				if s.device then
-					num[s.device] = num[s.device] and num[s.device] + 1 or 1
-					if s['.name'] == self.sid then
-						dev = "%s.network%d" %{ s.device, num[s.device] }
-						return false
-					end
+	local num = { }
+	local netid
+	uci_r:foreach("wireless", "wifi-iface",
+		function(s)
+			if s.device then
+				num[s.device] = num[s.device] and num[s.device] + 1 or 1
+				if s['.name'] == self.sid then
+					netid = "%s.network%d" %{ s.device, num[s.device] }
+					return false
 				end
-			end)
-	end
+			end
+		end)
+
+	local dev = uci_s:get("wireless", self.sid, "ifname") or netid
 
+	self.netid  = netid
 	self.wdev   = dev
 	self.iwinfo = dev and sys.wifi.getiwinfo(dev) or { }
 	self.iwdata = data or uci_s:get_all("wireless", self.sid) or
@@ -1109,7 +1110,7 @@ end
 
 function wifinet.adminlink(self)
 	return dsp.build_url("admin", "network", "wireless",
-		self.iwdata.device, self.wdev)
+		self.iwdata.device, self.netid)
 end
 
 function wifinet.get_network(self)