From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 11 Dec 2009 15:57:15 +0000 (+0000)
Subject: luci-0.9: fix last commit: swap back swapped values and swap the others instead
X-Git-Tag: 0.9.0~90
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ed2a86b70f80adfc1e711f54c587df7b9c5e3e04;p=project%2Fluci.git

luci-0.9: fix last commit: swap back swapped values and swap the others instead
---

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 7ff360502d..ff6bf7057c 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -101,8 +101,8 @@ if hwtype == "broadcom" then
 	mp = s:option(ListValue, "macfilter", translate("wifi_macpolicy"))
 	mp.optional = true
 	mp:value("")
-	mp:value("allow", translate("wifi_blacklist"))
-	mp:value("deny", translate("wifi_whitelist"))
+	mp:value("allow", translate("wifi_whitelist"))
+	mp:value("deny", translate("wifi_blacklist"))
 	ml = s:option(DynamicList, "maclist", translate("wifi_maclist"))
 	ml:depends({macfilter="allow"})
 	ml:depends({macfilter="deny"})
@@ -222,8 +222,8 @@ if hwtype == "atheros" then
 	mp = s:option(ListValue, "macpolicy", translate("wifi_macpolicy"))
 	mp.optional = true
 	mp:value("")
-	mp:value("deny", translate("wifi_whitelist"))
-	mp:value("allow", translate("wifi_blacklist"))
+	mp:value("allow", translate("wifi_whitelist"))
+	mp:value("deny", translate("wifi_blacklist"))
 	ml = s:option(DynamicList, "maclist", translate("wifi_maclist"))
 	ml:depends({macpolicy="allow"})
 	ml:depends({macpolicy="deny"})
@@ -298,8 +298,8 @@ if hwtype == "prism2" then
 	mp = s:option(ListValue, "macpolicy", translate("wifi_macpolicy"))
 	mp.optional = true
 	mp:value("")
-	mp:value("deny", translate("wifi_whitelist"))
-	mp:value("allow", translate("wifi_blacklist"))
+	mp:value("allow", translate("wifi_whitelist"))
+	mp:value("deny", translate("wifi_blacklist"))
 	ml = s:option(DynamicList, "maclist", translate("wifi_maclist"))
 	ml:depends({macpolicy="allow"})
 	ml:depends({macpolicy="deny"})