Changeset 6775

Timestamp:

01/21/11 00:26:49 (2 years ago)

Author:

jow

Message:

modules/admin-full: rework wifi CBI maps

Location:

luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network

Files:

• wifi.lua (modified) (9 diffs)
• wifi_add.lua (modified) (1 diff)

luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua

@@ -18 +18 @@
 
 arg[1] = arg[1] or ""
-arg[2] = arg[2] or ""
 
 m = Map("wireless", "",
@@ -31 +30 @@
 
 function m.on_commit(map)
-    local wnet = nw:get_wifinet(arg[2])
+    local wnet = nw:get_wifinet(arg[1])
     if ifsection and wnet then
         ifsection.section = wnet.sid
-        m.title = wnet:get_i18n()
+        m.title = luci.util.pcdata(wnet:get_i18n())
     end
 end
@@ -40 +39 @@
 nw.init(m.uci)
 
-local wnet = nw:get_wifinet(arg[2])
+local wnet = nw:get_wifinet(arg[1])
+local wdev = wnet and wnet:get_device()
 
 -- redirect to overview page if network does not exist anymore (e.g. after a revert)
-if not wnet then
+if not wnet or not wdev then
     luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
     return
 end
 
-m.title = wnet:get_i18n()
+m.title = luci.util.pcdata(wnet:get_i18n())
 
 
@@ -56 +56 @@
 
 
-s = m:section(NamedSection, arg[1], "wifi-device", translate("Device Configuration"))
+s = m:section(NamedSection, wdev:name(), "wifi-device", translate("Device Configuration"))
 s.addremove = false
 
@@ -71 +71 @@
 st = s:taboption("general", DummyValue, "__status", translate("Status"))
 st.template = "admin_network/wifi_status"
-st.ifname   = arg[2]
+st.ifname   = arg[1]
 
 en = s:taboption("general", Flag, "disabled", translate("Enable device"))
@@ -83 +83 @@
 
 
-local hwtype = m:get(arg[1], "type")
-local htcaps = m:get(arg[1], "ht_capab") and true or false
+local hwtype = wdev:get("type")
+local htcaps = wdev:get("ht_capab") and true or false
 
 -- NanoFoo
-local nsantenna = m:get(arg[1], "antenna")
+local nsantenna = wdev:get("antenna")
 
 ch = s:taboption("general", Value, "channel", translate("Channel"))
@@ -277 +277 @@
 s.addremove = false
 s.anonymous = true
-s.defaults.device = arg[1]
+s.defaults.device = wdev:name()
 
 s:tab("general", translate("General Setup"))
@@ -634 +634 @@
         return 1
     end
-    return slot     
+    return slot
 end
 
@@ -649 +649 @@
     wepkey.rmempty = true
     wepkey.password = true
-    
+
     function wepkey.write(self, section, value)
         if value and (#value == 5 or #value == 13) then

luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/wifi_add.lua

@@ -167 +167 @@
             uci:save("firewall")
 
-            luci.http.redirect(luci.dispatcher.build_url(
-                "admin/network/wireless", wdev:name(), wnet:ifname()
-            ))
+            luci.http.redirect(wnet:adminlink())
         end
     end