- add workaround for libuci-lua bug when writing list values
- compare values against keyllist not vallist when validating StaticList
-> fixes StaticList and DynamicList widgets
local upldir = "/lib/uci/upload/"
local cbidir = luci.util.libpath() .. "/model/cbi/"
local upldir = "/lib/uci/upload/"
local cbidir = luci.util.libpath() .. "/model/cbi/"
-
- assert(luci.fs.stat(cbimap) or luci.fs.stat(cbidir..cbimap..".lua"),
+
+ assert(luci.fs.stat(cbimap) or luci.fs.stat(cbidir..cbimap..".lua"),
local func, err = loadfile(cbimap)
if not func then
func, err = loadfile(cbidir..cbimap..".lua")
local func, err = loadfile(cbimap)
if not func then
func, err = loadfile(cbidir..cbimap..".lua")
self.uci = uci.cursor()
self.save = true
self.uci = uci.cursor()
self.save = true
if not self.uci:load(self.config) then
error("Unable to read UCI data: " .. self.config)
end
if not self.uci:load(self.config) then
error("Unable to read UCI data: " .. self.config)
end
function Compound.parse(self, ...)
local cstate, state = 0, 0
function Compound.parse(self, ...)
local cstate, state = 0, 0
for k, child in ipairs(self.children) do
cstate = child:parse(...)
state = (not state or cstate < state) and cstate or state
end
for k, child in ipairs(self.children) do
cstate = child:parse(...)
state = (not state or cstate < state) and cstate or state
end
function Delegator.state(self, name, node, transitor)
transitor = transitor or self.transistor_linear
local state = {node=node, name=name, transitor=transitor}
function Delegator.state(self, name, node, transitor)
transitor = transitor or self.transistor_linear
local state = {node=node, name=name, transitor=transitor}
assert(instanceof(node, Node), "Invalid node")
assert(not self.nodes[name], "Duplicate entry")
assert(instanceof(node, Node), "Invalid node")
assert(not self.nodes[name], "Duplicate entry")
self.nodes[name] = state
self:append(state)
self.nodes[name] = state
self:append(state)
function Delegator.parse(self, ...)
local active = self:getactive()
assert(active, "Invalid state")
function Delegator.parse(self, ...)
local active = self:getactive()
assert(active, "Invalid state")
local cstate = active.node:parse()
self.active = active.transistor(self, active.node, cstate)
local cstate = active.node:parse()
self.active = active.transistor(self, active.node, cstate)
if not self.active then
return FORM_DONE
else
if not self.active then
return FORM_DONE
else
end
function Delegator.getactive(self)
end
function Delegator.getactive(self)
- return self:get(Map.formvalue(self, "cbi.delegated")
- or (self.children[1] and self.children[1].name))
+ return self:get(Map.formvalue(self, "cbi.delegated")
+ or (self.children[1] and self.children[1].name))
local datasource = {}
datasource.config = "table"
self.data = data
local datasource = {}
datasource.config = "table"
self.data = data
datasource.formvalue = Map.formvalue
datasource.formvaluetable = Map.formvaluetable
datasource.readinput = true
datasource.formvalue = Map.formvalue
datasource.formvaluetable = Map.formvaluetable
datasource.readinput = true
function datasource.get(self, section, option)
return data[section] and data[section][option]
end
function datasource.get(self, section, option)
return data[section] and data[section][option]
end
function datasource.submitstate(self)
return Map.formvalue(self, "cbi.submit")
end
function datasource.submitstate(self)
return Map.formvalue(self, "cbi.submit")
end
end
end
AbstractSection.parse_optionals(self, s)
end
end
AbstractSection.parse_optionals(self, s)
if self.changed then
self:push_events()
end
if self.changed then
self:push_events()
end
if self:write(section, fvalue) then
-- Push events
self.section.changed = true
if self:write(section, fvalue) then
-- Push events
self.section.changed = true
- --luci.util.append(self.map.events, self.events)
+ --luci.util.append(self.map.events, self.events)
end
end
else -- Unset the UCI or error
end
end
else -- Unset the UCI or error
-- Write to UCI
function AbstractValue.write(self, section, value)
-- Write to UCI
function AbstractValue.write(self, section, value)
+ -- Work around a bug in libuci-lua;
+ -- list values are not overwritten but appended, resolve this
+ -- by removing the value before
+ if type(value) == "table" then
+ self.map:del(section, self.option)
+ end
+
return self.map:set(section, self.option, value)
end
return self.map:set(section, self.option, value)
end
local valid = {}
for i, v in ipairs(value) do
local valid = {}
for i, v in ipairs(value) do
- if luci.util.contains(self.vallist, v) then
+ if luci.util.contains(self.keylist, v) then
table.insert(valid, v)
end
end
table.insert(valid, v)
end
end