Changeset 8169

Show
Ignore:
Timestamp:
01/09/12 06:48:27 (17 months ago)
Author:
jow
Message:

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

Location:
luci/trunk/applications/luci-firewall/luasrc/model/cbi/firewall
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • luci/trunk/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua

    r8117 r8169  
    283283 
    284284    o = s:option(Value, "src_port", translate("Source port")) 
    285     o.datatype = "list(neg,portrange)" 
     285    o.datatype = "list(neg(portrange))" 
    286286    o.placeholder = translate("any") 
    287287 
    … …  
    300300 
    301301    o = s:option(Value, "dest_port", translate("Destination port")) 
    302     o.datatype = "list(neg,portrange)" 
     302    o.datatype = "list(neg(portrange))" 
    303303    o.placeholder = translate("any") 
    304304 

  • luci/trunk/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua

    r8154 r8169  
    138138 
    139139msrc.optional = true 
    140 msrc.datatype = "list(neg,network)" 
     140msrc.datatype = "list(neg(or(uciname,hostname,ip4addr)))" 
    141141msrc.placeholder = "0.0.0.0/0" 
    142142msrc:depends("family", "") 
    … …  
    147147 
    148148mdest.optional = true 
    149 mdest.datatype = "list(neg,network)" 
     149mdest.datatype = "list(neg(or(uciname,hostname,ip4addr)))" 
    150150mdest.placeholder = "0.0.0.0/0" 
    151151mdest:depends("family", "")