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

luci-0.9: merge r5340

Browse source
This commit is contained in:
Jo-Philipp Wich 2009-09-24 16:52:27 +00:00
parent aa4f626aab
commit edda488b29
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -369,7 +369,7 @@ function Map.parse(self, readinput, ...)
for i, config in ipairs(self.parsechain) do for i, config in ipairs(self.parsechain) do
self.uci:save(config) self.uci:save(config)
end end
if self:submitstate() and not self.proceed and (self.flow.autoapply or luci.http.formvalue("cbi.apply")) then if self:submitstate() and ((not self.proceed and self.flow.autoapply) or luci.http.formvalue("cbi.apply")) then
for i, config in ipairs(self.parsechain) do for i, config in ipairs(self.parsechain) do
self.uci:commit(config) self.uci:commit(config)
@ -1292,6 +1292,22 @@ function AbstractValue.parse(self, section, novld)
local fvalue = self:formvalue(section) local fvalue = self:formvalue(section)
local cvalue = self:cfgvalue(section) local cvalue = self:cfgvalue(section)
-- If favlue and cvalue are both tables and have the same content
-- make them identical
if type(fvalue) == "table" and type(cvalue) == "table" then
local equal = #fvalue == #cvalue
if equal then
for i=1, #fvalue do
if cvalue[i] ~= fvalue[i] then
equal = false
end
end
end
if equal then
fvalue = cvalue
end
end
if fvalue and #fvalue > 0 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)) fvalue = self:transform(self:validate(fvalue, section))
if not fvalue and not novld then if not fvalue and not novld then