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

CBI-UVL Validation Integration part #1

Browse source
This commit is contained in:
Steven Barth 2008-08-28 19:31:25 +00:00
parent 565bc6d4c2
commit 4ca6f02af2
9 changed files with 99 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
i18n/english/luasrc/i18n/cbi.en.lua
View file

@ -1,7 +1,10 @@
cbi_add = [[Add entry]]
cbi_del = [[Remove entry]]
cbi_invalid = [[<strong>Error:</strong> Invalid input value]]
cbi_invalid_section = [[<strong>Error:</strong> Validation failed]]
cbi_missing = [[<strong>Error:</strong> This field is mandatory]]
cbi_deperror = [[<strong>Error:</strong> At least one mandatory field has no or an invalid value]]
cbi_reqerror = [[<strong>Error:</strong> A requirement for this option was not met]]
cbi_addopt = [[-- Additional Field --]]
cbi_optional = [[ (optional)]]
cbi_sectempty = [[This section contains no values yet]]

3
i18n/english/luasrc/i18n/cbi.en.xml
View file

@ -5,7 +5,10 @@
<i18n:msg xml:id="cbi_add">Add entry</i18n:msg>
<i18n:msg xml:id="cbi_del">Remove entry</i18n:msg>
<i18n:msg xml:id="cbi_invalid"><strong>Error:</strong> Invalid input value</i18n:msg>
<i18n:msg xml:id="cbi_invalid_section"><strong>Error:</strong> Validation failed</i18n:msg>
<i18n:msg xml:id="cbi_missing"><strong>Error:</strong> This field is mandatory</i18n:msg>
<i18n:msg xml:id="cbi_deperror"><strong>Error:</strong> At least one mandatory field has no or an invalid value</i18n:msg>
<i18n:msg xml:id="cbi_reqerror"><strong>Error:</strong> A requirement for this option was not met</i18n:msg>
<i18n:msg xml:id="cbi_addopt">-- Additional Field --</i18n:msg>
<i18n:msg xml:id="cbi_optional"> (optional)</i18n:msg>
<i18n:msg xml:id="cbi_sectempty">This section contains no values yet</i18n:msg>

3
i18n/german/luasrc/i18n/cbi.de.lua
View file

@ -1,7 +1,10 @@
cbi_add = [[Eintrag hinzufügen]]
cbi_del = [[Eintrag entfernen]]
cbi_invalid = [[Fehler: Ungültige Eingabe]]
cbi_invalid_section = [[<strong>Fehler:</strong> Validierung fehlgeschlagen]]
cbi_missing = [[Fehler: Dieses Feld muss ausgefüllt werden]]
cbi_deperror = [[<strong>Fehler:</strong> Mindestens ein benötigtes Feld ist leer oder hat einen ungültigen Wert]]
cbi_reqerror = [[<strong>Fehler:</strong> Nicht erfüllte Abhängigkeit für dieses Feld]]
cbi_addopt = [[-- Zusätzliches Feld --]]
cbi_sectempty = [[Diese Sektion enthält noch keine Einträge]]
cbi_manual = [[-- benutzerdefiniert --]]

3
i18n/german/luasrc/i18n/cbi.de.xml
View file

@ -5,7 +5,10 @@
<i18n:msg xml:id="cbi_add">Eintrag hinzufügen</i18n:msg>
<i18n:msg xml:id="cbi_del">Eintrag entfernen</i18n:msg>
<i18n:msg xml:id="cbi_invalid">Fehler: Ungültige Eingabe</i18n:msg>
<i18n:msg xml:id="cbi_invalid_section"><strong>Fehler:</strong> Validierung fehlgeschlagen</i18n:msg>
<i18n:msg xml:id="cbi_missing">Fehler: Dieses Feld muss ausgefüllt werden</i18n:msg>
<i18n:msg xml:id="cbi_deperror"><strong>Fehler:</strong> Mindestens ein benötigtes Feld ist leer oder hat einen ungültigen Wert</i18n:msg>
<i18n:msg xml:id="cbi_reqerror"><strong>Fehler:</strong> Nicht erfüllte Abhängigkeit für dieses Feld</i18n:msg>
<i18n:msg xml:id="cbi_addopt">-- Zusätzliches Feld --</i18n:msg>
<i18n:msg xml:id="cbi_sectempty">Diese Sektion enthält noch keine Einträge</i18n:msg>
<i18n:msg xml:id="cbi_manual">-- benutzerdefiniert --</i18n:msg>

86
libs/cbi/luasrc/cbi.lua
View file

@ -175,12 +175,14 @@ function Map.__init__(self, config, ...)
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)
@ -202,24 +204,26 @@ end
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
@ -385,6 +389,10 @@ function AbstractSection.__init__(self, map, sectiontype, ...)
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
@ -413,6 +421,7 @@ function AbstractSection.option(self, class, option, ...)
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.")
@ -576,7 +585,7 @@ NamedSection = class(AbstractSection)
function NamedSection.__init__(self, map, section, stype, ...)
AbstractSection.__init__(self, map, stype, ...)
Node._i18n(self, map.config, section, nil, ...)
-- Defaults
self.addremove = false
@ -597,7 +606,6 @@ function NamedSection.parse(self)
local s = self.section
local active = self:cfgvalue(s)
if self.addremove then
local path = self.config.."."..s
if active then -- Remove the section
@ -620,8 +628,23 @@ function NamedSection.parse(self)
if not self.override_scheme and self.map.scheme then
local co = self.map:get()
local stat, err = self.map.validator:validate_section(self.config, s, co)
luci.http.prepare_content("text/html")
luci.util.dumptable(err)
if err then
self.map.save = false
if err.code == luci.uvl.errors.ERR_DEPENDENCY then
self.tag_deperror[s] = true
else
self.tag_invalid[s] = true
end
for i, v in ipairs(err.childs) do
if v.option and self.fields[v.option] then
if v.code == luci.uvl.errors.ERR_DEPENDENCY then
self.fields[v.option].tag_reqerror[s] = true
elseif v.code == luci.uvl.errors.ERR_OPTION then
self.fields[v.option].tag_invalid[s] = true
end
end
end
end
end
end
AbstractSection.parse_optionals(self, s)
@ -719,9 +742,25 @@ function TypedSection.parse(self)
Node.parse(self, k)
if not self.override_scheme and self.map.scheme then
co = co or self.map:get()
local stat, err = self.map.uvl:validate_section(self.config, k, co)
luci.util.perror(err)
local co = self.map:get()
local stat, err = self.map.validator:validate_section(self.config, k, co)
if err then
self.map.save = false
if err.code == luci.uvl.errors.ERR_DEPENDENCY then
self.tag_deperror[k] = true
else
self.tag_invalid[k] = true
end
for i, v in ipairs(err.childs) do
if v.option and self.fields[v.option] then
if v.code == luci.uvl.errors.ERR_DEPENDENCY then
self.fields[v.option].tag_reqerror[k] = true
elseif v.code == luci.uvl.errors.ERR_OPTION then
self.fields[v.option].tag_invalid[k] = true
end
end
end
end
end
end
AbstractSection.parse_optionals(self, k)
@ -780,6 +819,7 @@ function AbstractValue.__init__(self, map, section, option, ...)
self.config = map.config
self.tag_invalid = {}
self.tag_missing = {}
self.tag_reqerror = {}
self.tag_error = {}
self.deps = {}
self.cast = "string"

2
libs/cbi/luasrc/view/cbi/cell_valuefooter.htm
View file

@ -15,6 +15,8 @@ $Id$
<% if self.tag_error[section] then -%>
<div class="cbi-error"><%=self.tag_error[section]%></div>
<%- elseif self.tag_reqerror[section] then -%>
<div class="cbi-error"><%:cbi_reqerror%></div>
<%- elseif self.tag_invalid[section] then -%>
<div class="cbi-error"><%:cbi_invalid%></div>
<%- elseif self.tag_missing[section] then -%>

2
libs/cbi/luasrc/view/cbi/full_valuefooter.htm
View file

@ -28,6 +28,8 @@ $Id$
<% if self.tag_error[section] then -%>
<div class="cbi-error"><%=self.tag_error[section]%></div>
<%- elseif self.tag_reqerror[section] then -%>
<div class="cbi-error"><%:cbi_reqerror%></div>
<%- elseif self.tag_invalid[section] then -%>
<div class="cbi-error"><%:cbi_invalid%></div>
<%- elseif self.tag_missing[section] then -%>

13
libs/cbi/luasrc/view/cbi/tblsection.htm
View file

@ -89,6 +89,19 @@ end
</td>
<%- end -%>
</tr>
<% if self.tag_deperror[section] or self.tag_invalid[section] or self.tag_error[section] then %>
<tr class="cbi-section-table-row">
<td colspan="<%=count%>">
<%- if self.tag_deperror[section] then -%>
<div class="cbi-error"><%:cbi_deperror%></div>
<%- elseif self.tag_invalid[section] then -%>
<div class="cbi-error"><%:cbi_invalid_section%></div>
<%- elseif self.tag_error[section] then -%>
<div class="cbi-error"><%=self.tag_error[section]%></div>
<%- end -%>
</td>
</tr>
<% end %>
<%- end -%>
<%- if isempty then -%>

7
libs/cbi/luasrc/view/cbi/ucisection.htm
View file

@ -16,6 +16,13 @@ $Id$
<% self:render_children(section, scope or {}) %>
<% if #self.optionals[section] > 0 or self.dynamic then %>
<% if self.tag_deperror[section] then -%>
<div class="cbi-error"><%:cbi_deperror%></div>
<% elseif self.tag_invalid[section] then -%>
<div class="cbi-error"><%:cbi_invalid_section%></div>
<%- elseif self.tag_error[section] then -%>
<div class="cbi-error"><%=self.tag_error[section]%></div>
<%- end %>
<div class="cbi-optionals">
<% if self.dynamic then %>
<input type="text" name="cbi.opt.<%=self.config%>.<%=section%>" />