assert(func, err)
luci.i18n.loadc("cbi")
+ luci.i18n.loadc("uvl")
local env = {
translate=i18n.translate,
translatef=i18n.translatef,
arg={...}
}
-
+
setfenv(func, setmetatable(env, {__index =
function(tbl, key)
return rawget(tbl, key) or _M[key] or _G[key]
if not instanceof(map, Node) then
error("CBI map returns no valid map object!")
return nil
+ else
+ map:prepare()
end
end
luci.uvl.STRICT_UNKNOWN_OPTIONS = false
luci.uvl.STRICT_UNKNOWN_SECTIONS = false
- local stat, err = node.map.validator:validate_section(node.config, name, co)
- if err then
- node.map.save = false
- if err:is(luci.uvl.errors.ERR_DEPENDENCY) then
- node.tag_deperror[name] = true
- else
- node.tag_invalid[name] = true
+ local function tag_fields(e)
+ if e.option and node.fields[e.option] then
+ if node.fields[e.option].error then
+ node.fields[e.option].error[name] = e
+ else
+ node.fields[e.option].error = { [name] = e }
+ end
+ elseif e.childs then
+ for _, c in ipairs(e.childs) do tag_fields(c) end
end
- for i, v in ipairs(err.childs) do
- if v.option and node.fields[v.option] then
- if v:is(luci.uvl.errors.ERR_DEPENDENCY) then
- node.fields[v.option].tag_reqerror[name] = true
- elseif v:is(luci.uvl.errors.ERR_OPT_REQUIRED) then
- node.fields[v.option].tag_missing[name] = true
- node.tag_deperror[name] = true
- elseif v:is(luci.uvl.errors.ERR_OPTION) then
- node.fields[v.option].tag_invalid[name] = true
- end
+ end
+
+ local function tag_section(e)
+ local s = { }
+ for _, c in ipairs(e.childs) do
+ if c.childs and not c:is(luci.uvl.errors.ERR_DEPENDENCY) then
+ table.insert( s, c.childs[1]:string() )
+ else
+ table.insert( s, c:string() )
end
end
+ if #s > 0 then
+ if node.error then
+ node.error[name] = s
+ else
+ node.error = { [name] = s }
+ end
+ end
+ end
+
+ local stat, err = node.map.validator:validate_section(node.config, name, co)
+ if err then
+ node.map.save = false
+ tag_fields(err)
+ tag_section(err)
end
end
end
end
+-- Prepare nodes
+function Node.prepare(self, ...)
+ for k, child in ipairs(self.children) do
+ child:prepare(...)
+ end
+end
+
-- Append child nodes
function Node.append(self, obj)
table.insert(self.children, obj)
self.config = config
self.parsechain = {self.config}
self.template = "cbi/map"
+ self.apply_on_parse = nil
self.uci = uci.cursor()
self.save = true
if not self.uci:load(self.config) then
self.validator = luci.uvl.UVL()
self.scheme = self.validator:get_scheme(self.config)
-
+
end
function Map.get_scheme(self, sectiontype, option)
end
-- Use optimized UCI writing
-function Map.parse(self, ...)
- Node.parse(self, ...)
+function Map.parse(self)
+ Node.parse(self)
if self.save then
for i, config in ipairs(self.parsechain) do
if luci.http.formvalue("cbi.apply") then
for i, config in ipairs(self.parsechain) do
self.uci:commit(config)
- self.uci:apply(config)
-
+
-- Refresh data because commit changes section names
self.uci:load(config)
end
-
+ if self.apply_on_parse then
+ self.uci:apply(self.parsechain)
+ else
+ self._apply = function()
+ local cmd = self.uci:apply(self.parsechain, true)
+ return io.popen(cmd)
+ end
+ end
+
-- Reparse sections
- Node.parse(self, ...)
-
+ Node.parse(self, true)
+
end
for i, config in ipairs(self.parsechain) do
self.uci:unload(config)
end
end
+function Map.render(self, ...)
+ Node.render(self, ...)
+ if self._apply then
+ local fp = self._apply()
+ fp:read("*a")
+ fp:close()
+ end
+end
+
-- Creates a child section
function Map.section(self, class, ...)
if instanceof(class, AbstractSection) then
local stat
if section then
- stat = self.map:set(section, nil, self.sectiontype)
+ stat = section:match("^%w+$") and self.map:set(section, nil, self.sectiontype)
else
section = self.map:add(self.sectiontype)
stat = section
function NamedSection.__init__(self, map, section, stype, ...)
AbstractSection.__init__(self, map, stype, ...)
Node._i18n(self, map.config, section, nil, ...)
-
+
-- Defaults
self.addremove = false
self.section = section
end
-function NamedSection.parse(self)
+function NamedSection.parse(self, novld)
local s = self.section
local active = self:cfgvalue(s)
AbstractSection.parse_dynamic(self, s)
if luci.http.formvalue("cbi.submit") then
Node.parse(self, s)
-
- if not self.override_scheme and self.map.scheme then
+
+ if not novld and not self.override_scheme and self.map.scheme then
_uvl_validate_section(self, s)
end
end
table.insert(self.deps, {option=option, value=value})
end
-function TypedSection.parse(self)
+function TypedSection.parse(self, novld)
if self.addremove then
-- Remove
local crval = REMOVE_PREFIX .. self.config
AbstractSection.parse_dynamic(self, k)
if luci.http.formvalue("cbi.submit") then
Node.parse(self, k)
-
- if not self.override_scheme and self.map.scheme then
+
+ if not novld and not self.override_scheme and self.map.scheme then
_uvl_validate_section(self, k)
end
end
if name and #name > 0 then
created = self:create(name) and name
+ if not created then
+ self.invalid_cts = true
+ end
end
end
end
self.tag_reqerror = {}
self.tag_error = {}
self.deps = {}
- self.cast = "string"
+ --self.cast = "string"
self.track_missing = false
- self.rmempty = false
+ --self.rmempty = false
self.default = nil
self.size = nil
self.optional = false
+end
+function AbstractValue.prepare(self)
-- Use defaults from UVL
if not self.override_scheme
and self.map:get_scheme(self.section.sectiontype, self.option) then
local vs = self.map:get_scheme(self.section.sectiontype, self.option)
- self.rmempty = not vs.required
- self.cast = (vs.type == "list") and "list" or "string"
+ if self.rmempty == nil then
+ self.rmempty = not vs.required
+ end
+ if self.cast == nil then
+ self.cast = (vs.type == "list") and "list" or "string"
+ end
self.title = self.title or vs.title
self.description = self.description or vs.descr
- self.default = vs.default
+ if self.default == nil then
+ self.default = vs.default
+ end
if vs.depends and not self.override_dependencies then
for i, deps in ipairs(vs.depends) do
end
end
end
+
+ self.cast = self.cast or "string"
end
-- Add a dependencie to another section field
local fvalue = self:formvalue(section)
local cvalue = self:cfgvalue(section)
- if fvalue and fvalue ~= "" then -- If we have a form value, write it to UCI
+ if fvalue and #fvalue > 0 then -- If we have a form value, write it to UCI
fvalue = self:transform(self:validate(fvalue, section))
if not fvalue then
self.tag_invalid[section] = true
-- Return the UCI value of this object
function AbstractValue.cfgvalue(self, section)
local value = self.map:get(section, self.option)
- if not self.cast or self.cast == type(value) then
+ if not value then
+ return nil
+ elseif not self.cast or self.cast == type(value) then
return value
elseif self.cast == "string" then
if type(value) == "table" then
self.vallist = {}
self.size = 1
self.widget = "select"
+end
+function ListValue.prepare(self, ...)
+ AbstractValue.prepare(self, ...)
if not self.override_scheme
and self.map:get_scheme(self.section.sectiontype, self.option) then
local vs = self.map:get_scheme(self.section.sectiontype, self.option)
- if self.value and vs.values and not self.override_values then
- if self.rmempty or self.optional then
- self:value("")
- end
- for k, v in pairs(vs.values) do
+ if self.value and vs.valuelist and not self.override_values then
+ for k, v in ipairs(vs.valuelist) do
local deps = {}
if not self.override_dependencies
- and vs.enum_depends and vs.enum_depends[k] then
- for i, dep in ipairs(vs.enum_depends[k]) do
+ and vs.enum_depends and vs.enum_depends[v.value] then
+ for i, dep in ipairs(vs.enum_depends[v.value]) do
table.insert(deps, _uvl_strip_remote_dependencies(dep))
end
end
- self:value(k, v, unpack(deps))
+ self:value(v.value, v.title or v.value, unpack(deps))
end
end
end
local valid = {}
for i, v in ipairs(value) do
- if luci.util.contains(self.valuelist, v) then
+ if luci.util.contains(self.vallist, v) then
table.insert(valid, v)
end
end
table.insert(self.vallist, tostring(val))
end
-function DynamicList.validate(self, value, section)
+function DynamicList.formvalue(self, section)
+ local value = AbstractValue.formvalue(self, section)
value = (type(value) == "table") and value or {value}
local valid = {}