-- i18n loaded?
if type(luci.i18n) == "table" then
- local key = config:gsub("[^%w]+", "")
+ local key = config and config:gsub("[^%w]+", "") or ""
if section then key = key .. "_" .. section:lower():gsub("[^%w]+", "") end
- if option then key = key .. "_" .. option:lower():gsub("[^%w]+", "") end
+ if option then key = key .. "_" .. tostring(option):lower():gsub("[^%w]+", "") end
self.title = title or luci.i18n.translate( key, option or section or config )
self.description = description or luci.i18n.translate( key .. "_desc", "" )
self.config = config
self.parsechain = {self.config}
self.template = "cbi/map"
- if not uci.load(self.config) then
+ if not uci.load_config(self.config) then
error("Unable to read UCI data: " .. self.config)
end
end
-- Use optimized UCI writing
function Map.parse(self, ...)
+ if self.stateful then
+ uci.load_state(self.config)
+ else
+ uci.load_config(self.config)
+ end
+
Node.parse(self, ...)
+
for i, config in ipairs(self.parsechain) do
- uci.save(config)
+ uci.save_config(config)
end
if luci.http.formvalue("cbi.apply") then
for i, config in ipairs(self.parsechain) do
end
-- Refresh data because commit changes section names
- uci.unload(config)
- uci.load(config)
+ uci.load_config(config)
end
-- Reparse sections
end
end
--- UCI stateget
-function Map.stateget(self, section, option)
- return uci.get_statevalue(self.config, section, option)
-end
-
--[[
Page - A simple node
or valid and 1
or -1
- self.dorender = self:handle(state, self.data) ~= false
+ self.dorender = not self.handle or self:handle(state, self.data) ~= false
end
function SimpleForm.render(self, ...)
end
+Table = class(AbstractSection)
+
+function Table.__init__(self, form, data, ...)
+ local datasource = {}
+ datasource.config = "table"
+ self.data = data
+
+ function datasource.get(self, section, option)
+ return data[section] and data[section][option]
+ end
+
+ function datasource.del(...)
+ return true
+ end
+
+ AbstractSection.__init__(self, datasource, "table", ...)
+ self.template = "cbi/tblsection"
+ self.rowcolors = true
+ self.anonymous = true
+end
+
+function Table.parse(self)
+ for i, k in ipairs(self:cfgsections()) do
+ if luci.http.formvalue("cbi.submit") then
+ Node.parse(self, k)
+ end
+ end
+end
+
+function Table.cfgsections(self)
+ local sections = {}
+
+ for i, v in luci.util.kspairs(self.data) do
+ table.insert(sections, i)
+ end
+
+ return sections
+end
+
+
--[[
NamedSection - A fixed configuration section defined by its name
self.config = map.config
self.tag_invalid = {}
self.tag_missing = {}
+ self.tag_error = {}
self.deps = {}
self.track_missing = false
self.default = nil
self.size = nil
self.optional = false
- self.stateful = false
end
-- Add a dependencie to another section field
function AbstractValue.depends(self, field, value)
- table.insert(self.deps, {field=field, value=value})
+ local deps
+ if type(field) == "string" then
+ deps = {}
+ deps[field] = value
+ else
+ deps = field
+ end
+
+ table.insert(self.deps, {deps=deps, add=""})
+end
+
+-- Generates the unique CBID
+function AbstractValue.cbid(self, section)
+ return "cbid."..self.map.config.."."..section.."."..self.option
end
-- Return whether this object should be created
-- Returns the formvalue for this object
function AbstractValue.formvalue(self, section)
- local key = "cbid."..self.map.config.."."..section.."."..self.option
- return luci.http.formvalue(key)
+ return luci.http.formvalue(self:cbid(section))
end
function AbstractValue.additional(self, value)
else -- Unset the UCI or error
if self.rmempty or self.optional then
self:remove(section)
- elseif self.track_missing and not fvalue or fvalue ~= cvalue then
+ elseif self.track_missing and (not fvalue or fvalue ~= cvalue) then
self.tag_missing[section] = true
end
end
if not self.optional or self:cfgvalue(s) or self:formcreated(s) then
scope = scope or {}
scope.section = s
- scope.cbid = "cbid." .. self.config ..
- "." .. s ..
- "." .. self.option
+ scope.cbid = self:cbid(s)
scope.ifattr = function(cond,key,val)
if cond then
return string.format(
' %s="%s"', tostring(key),
- tostring( val
+ luci.util.pcdata(tostring( val
or scope[key]
or (type(self[key]) ~= "function" and self[key])
- or "" )
+ or "" ))
)
else
return ''
-- Return the UCI value of this object
function AbstractValue.cfgvalue(self, section)
- return self.stateful
- and self.map:stateget(section, self.option)
- or self.map:get(section, self.option)
+ return self.map:get(section, self.option)
end
-- Validate the form value
self.widget = "select"
end
-function ListValue.value(self, key, val)
+function ListValue.value(self, key, val, ...)
val = val or key
table.insert(self.keylist, tostring(key))
table.insert(self.vallist, tostring(val))
+
+ for i, deps in ipairs({...}) do
+ table.insert(self.deps, {add = "-"..key, deps=deps})
+ end
end
function ListValue.validate(self, val)
AbstractValue.__init__(self, ...)
self.template = "cbi/tvalue"
end
+
+--[[
+Button
+]]--
+Button = class(AbstractValue)
+
+function Button.__init__(self, ...)
+ AbstractValue.__init__(self, ...)
+ self.template = "cbi/button"
+ self.inputstyle = nil
+ self.rmempty = true
+end
\ No newline at end of file
projects / project / luci.git / blobdiff