Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-firewall: use maxlength datatype instead of validate function

Browse source 
Switch the zonename validation to use
a compound datatype "and(uciname,maxlength(14))"
instead of a separate 'validate' function.

Remove the unnecessary function that was introduced by 34e875b

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2015-09-17 10:45:53 +03:00
parent f3f0de3e5e
commit edc58332f0
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua
View file

@ -60,7 +60,7 @@ s:tab("advanced", translate("Advanced Settings"))
name = s:taboption("general", Value, "name", translate("Name"))
name.optional = false
name.forcewrite = true
name.datatype = "uciname"
name.datatype = "and(uciname,maxlength(14))"
function name.write(self, section, value)
if zone:name() ~= value then
@ -76,15 +76,6 @@ function name.write(self, section, value)
}
end
function name.validate(self, value)
-- fw3 defines 14 as the maximum length of zone name
if #value > 14 then
return nil, translate("Zone name is too long")
else
return value
end
end
p = {
s:taboption("general", ListValue, "input", translate("Input")),
s:taboption("general", ListValue, "output", translate("Output")),