admin-mini: Override UVL values for wireless mode

[project/luci.git] / modules / admin-mini / luasrc / model / cbi / mini / wifi.lua

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index 1aa01d1..e938826 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -141,6 +141,7 @@ local hwtype = m:get(wifidevs[1], "type")
 
 if hwtype == "atheros" then
        mode = s:option(ListValue, "mode", translate("mode"))
+       mode.override_values = true
        mode:value("", "auto")
        mode:value("11b", "802.11b")
        mode:value("11g", "802.11g")
@@ -176,6 +177,7 @@ else
 end
 
 mode = s:option(ListValue, "mode", translate("mode"))
+mode.override_values = true
 mode:value("ap", translate("m_w_ap"))
 mode:value("adhoc", translate("m_w_adhoc"))
 mode:value("sta", translate("m_w_client"))
@@ -206,6 +208,7 @@ function mode.write(self, section, value)
 end
 
 encr = s:option(ListValue, "encryption", translate("encryption"))
+encr.override_values = true
 encr:value("none", "No Encryption")
 encr:value("wep", "WEP")
 
@@ -216,8 +219,8 @@ if hwtype == "atheros" or hwtype == "mac80211" then
        if hostapd and supplicant then
                encr:value("psk", "WPA-PSK")
                encr:value("psk2", "WPA2-PSK")
-               encr:value("wpa", "WPA-EAP", {mode="ap"})
-               encr:value("wpa2i", "WPA2-EAP", {mode="ap"})
+               encr:value("wpa", "WPA-Radius", {mode="ap"})
+               encr:value("wpa2i", "WPA2-Radius", {mode="ap"})
        elseif hostapd and not supplicant then
                encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"})
                encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"})