From: Jo-Philipp Wich Date: Sat, 25 Jun 2011 22:44:10 +0000 (+0000) Subject: luci-0.10: merge r7234 X-Git-Tag: 0.10.0~110 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2e8c061be0b15948ff637c18fcbfc5d9ebd6eb48;p=oweals%2Fluci.git luci-0.10: merge r7234 --- diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua index 002041911..cc534f5c9 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -436,8 +436,8 @@ if hwtype == "atheros" then mp = s:taboption("macfilter", ListValue, "macpolicy", translate("MAC-Address Filter")) mp:value("", translate("disable")) - mp:value("deny", translate("Allow listed only")) - mp:value("allow", translate("Allow all except listed")) + mp:value("allow", translate("Allow listed only")) + mp:value("deny", translate("Allow all except listed")) ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List")) ml.datatype = "macaddr" @@ -511,8 +511,8 @@ if hwtype == "prism2" then mp = s:taboption("macfilter", ListValue, "macpolicy", translate("MAC-Address Filter")) mp:value("", translate("disable")) - mp:value("deny", translate("Allow listed only")) - mp:value("allow", translate("Allow all except listed")) + mp:value("allow", translate("Allow listed only")) + mp:value("deny", translate("Allow all except listed")) ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List")) ml:depends({macpolicy="allow"}) ml:depends({macpolicy="deny"})