summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-firewall
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-01-09 05:48:27 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-01-09 05:48:27 +0000
commit3ee2fcccca383afec32cd72de4e1667347665d20 (patch)
tree1f03ef9a184322738b614b22a929381b84554483 /applications/luci-firewall
parent15846f9124c647d22885d74eda59b281632c3b07 (diff)
applications/luci-firewall: fix some datatype sepcifications after r8156
Diffstat (limited to 'applications/luci-firewall')
-rw-r--r--applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua4
-rw-r--r--applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua4
2 files changed, 4 insertions, 4 deletions
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua b/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
index 25666dd488..cd34030fae 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
+++ b/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
@@ -282,7 +282,7 @@ else
o = s:option(Value, "src_port", translate("Source port"))
- o.datatype = "list(neg,portrange)"
+ o.datatype = "list(neg(portrange))"
o.placeholder = translate("any")
@@ -299,7 +299,7 @@ else
o = s:option(Value, "dest_port", translate("Destination port"))
- o.datatype = "list(neg,portrange)"
+ o.datatype = "list(neg(portrange))"
o.placeholder = translate("any")
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua b/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
index 0da146acef..a3b1a6e764 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
+++ b/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
@@ -137,7 +137,7 @@ msrc = s:taboption("advanced", DynamicList, "masq_src",
translate("Restrict Masquerading to given source subnets"))
msrc.optional = true
-msrc.datatype = "list(neg,network)"
+msrc.datatype = "list(neg(or(uciname,hostname,ip4addr)))"
msrc.placeholder = "0.0.0.0/0"
msrc:depends("family", "")
msrc:depends("family", "ipv4")
@@ -146,7 +146,7 @@ mdest = s:taboption("advanced", DynamicList, "masq_dest",
translate("Restrict Masquerading to given destination subnets"))
mdest.optional = true
-mdest.datatype = "list(neg,network)"
+mdest.datatype = "list(neg(or(uciname,hostname,ip4addr)))"
mdest.placeholder = "0.0.0.0/0"
mdest:depends("family", "")
mdest:depends("family", "ipv4")