applications/luci-firewall: fix some datatype sepcifications after r8156

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 25666dd488c2b0d377bb07da14b427a1d2ee70af..cd34030faedb0dc754c6ab44fe5fb2f6b15803a4 100644 (file)
--- 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 0da146acef0896761ade1888a038dda5d5d82572..a3b1a6e764d6cc9693e46a3725349f854c3df737 100644 (file)
--- 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")