summaryrefslogtreecommitdiffhomepage
path: root/modules/admin-mini/luasrc/model/cbi
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-05-29 19:54:18 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-05-29 19:54:18 +0000
commit601deffafc9e2388f6bf4e78de090d076416e96f (patch)
treec8789ad20eb85170bfae2969005dc3c76ca5a598 /modules/admin-mini/luasrc/model/cbi
parent53e5655810611cf68f58e247f323308313cee1e5 (diff)
modules/admin-{mini,full}: fixup wpa-mixed dependencies, make key a password field, fix bssid dependency for broadcom ad-hoc mode in admin-mini
Diffstat (limited to 'modules/admin-mini/luasrc/model/cbi')
-rw-r--r--modules/admin-mini/luasrc/model/cbi/mini/wifi.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index 056b5ee4b6..7d05fb053b 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -253,10 +253,13 @@ end
key = s:option(Value, "key", translate("key"))
key:depends("encryption", "wep")
key:depends("encryption", "psk")
-key:depends({mode="ap", encryption="wpa"})
key:depends("encryption", "psk2")
+key:depends("encryption", "psk+psk2")
+key:depends("encryption", "mixed")
+key:depends({mode="ap", encryption="wpa"})
key:depends({mode="ap", encryption="wpa2"})
key.rmempty = true
+key.password = true
server = s:option(Value, "server", translate("a_w_radiussrv"))
server:depends({mode="ap", encryption="wpa"})
@@ -336,6 +339,7 @@ end
if hwtype == "broadcom" then
bssid:depends({mode="wds"})
+ bssid:depends({mode="adhoc"})
end