return maps
end
+local function _uvl_validate_section(node, name)
+ local co = node.map:get()
+ luci.uvl.STRICT_UNKNOWN_OPTIONS = false
+ local stat, err = node.map.validator:validate_section(node.config, name, co)
+ if err then
+ node.map.save = false
+ if err.code == luci.uvl.errors.ERR_DEPENDENCY then
+ node.tag_deperror[name] = true
+ else
+ node.tag_invalid[name] = true
+ end
+ for i, v in ipairs(err.childs) do
+ if v.option and node.fields[v.option] then
+ if v.code == luci.uvl.errors.ERR_OPTION then
+ local subcode = v.childs and v.childs[1] and v.childs[1].code
+ if subcode == luci.uvl.errors.ERR_DEPENDENCY then
+ node.fields[v.option].tag_reqerror[name] = true
+ elseif subcode == luci.uvl.errors.ERR_OPT_REQUIRED then
+ node.fields[v.option].tag_missing[name] = true
+ node.tag_deperror[name] = true
+ else
+ node.fields[v.option].tag_invalid[name] = true
+ end
+ end
+ end
+ end
+ end
+
+end
-function _uvl_strip_remote_dependencies(deps)
+local function _uvl_strip_remote_dependencies(deps)
local clean = {}
for k, v in pairs(deps) do
self.parsechain = {self.config}
self.template = "cbi/map"
self.uci = uci.cursor()
+ self.save = true
if not self.uci:load(self.config) then
error("Unable to read UCI data: " .. self.config)
end
self.validator = luci.uvl.UVL()
self.scheme = self.validator:get_scheme(self.config)
+
end
function Map.get_scheme(self, sectiontype, option)
function Map.parse(self, ...)
Node.parse(self, ...)
- for i, config in ipairs(self.parsechain) do
- self.uci:save(config)
- end
- if luci.http.formvalue("cbi.apply") then
+ if self.save 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)
+ self.uci:save(config)
+ end
+ 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
+
+ -- Reparse sections
+ Node.parse(self, ...)
+
+ end
+ for i, config in ipairs(self.parsechain) do
+ self.uci:unload(config)
end
-
- -- Reparse sections
- Node.parse(self, ...)
-
- end
- for i, config in ipairs(self.parsechain) do
- self.uci:unload(config)
end
end
self.config = map.config
self.optionals = {}
self.defaults = {}
+ self.fields = {}
+ self.tag_error = {}
+ self.tag_invalid = {}
+ self.tag_deperror = {}
self.optional = true
self.addremove = false
Node._i18n(obj, self.config, self.section or self.sectiontype, option, ...)
self:append(obj)
+ self.fields[option] = obj
return obj
elseif class == true then
error("No valid class was given and autodetection failed.")
function NamedSection.__init__(self, map, section, stype, ...)
AbstractSection.__init__(self, map, stype, ...)
Node._i18n(self, map.config, section, nil, ...)
-
+
-- Defaults
self.addremove = false
local s = self.section
local active = self:cfgvalue(s)
-
if self.addremove then
local path = self.config.."."..s
if active then -- Remove the section
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
+ _uvl_validate_section(self, s)
+ end
end
AbstractSection.parse_optionals(self, s)
end
end
function TypedSection.parse(self)
+ if self.addremove then
+ -- Remove
+ local crval = REMOVE_PREFIX .. self.config
+ local name = luci.http.formvaluetable(crval)
+ for k,v in pairs(name) do
+ if self:cfgvalue(k) and self:checkscope(k) then
+ self:remove(k)
+ end
+ end
+ end
+
+ local co
+ for i, k in ipairs(self:cfgsections()) do
+ 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
+ _uvl_validate_section(self, k)
+ end
+ end
+ AbstractSection.parse_optionals(self, k)
+ end
+
if self.addremove then
-- Create
local crval = CREATE_PREFIX .. self.config .. "." .. self.sectiontype
end
end
end
-
- -- Remove
- crval = REMOVE_PREFIX .. self.config
- name = luci.http.formvaluetable(crval)
- for k,v in pairs(name) do
- if self:cfgvalue(k) and self:checkscope(k) then
- self:remove(k)
- end
- end
- end
-
- for i, k in ipairs(self:cfgsections()) do
- AbstractSection.parse_dynamic(self, k)
- if luci.http.formvalue("cbi.submit") then
- Node.parse(self, k)
- end
- AbstractSection.parse_optionals(self, k)
end
end
self.config = map.config
self.tag_invalid = {}
self.tag_missing = {}
+ self.tag_reqerror = {}
self.tag_error = {}
self.deps = {}
self.cast = "string"
end
for k, v in pairs(vs.values) do
local deps = {}
- if vs.enum_depends and vs.enum_depends[k] then
+ 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
table.insert(deps, _uvl_strip_remote_dependencies(dep))
end
end
function ListValue.value(self, key, val, ...)
+ if luci.util.contains(self.keylist, key) then
+ return
+ end
+
val = val or key
table.insert(self.keylist, tostring(key))
table.insert(self.vallist, tostring(val))
end
function MultiValue.value(self, key, val)
+ if luci.util.contains(self.keylist, key) then
+ return
+ end
+
val = val or key
table.insert(self.keylist, tostring(key))
table.insert(self.vallist, tostring(val))
projects / project / luci.git / blobdiff