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

libs/cbi: fix crash with tabless sections

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-04-27 07:25:20 +00:00
parent eca5a0abf0
commit 4dc420efd3
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -764,6 +764,11 @@ function AbstractSection.tab(self, tab, title, desc)
} }
end end
-- Check whether the section has tabs
function AbstractSection.has_tabs(self)
return (self.tabs ~= nil) and (next(self.tabs) ~= nil)
end
-- Appends a new option -- Appends a new option
function AbstractSection.option(self, class, option, ...) function AbstractSection.option(self, class, option, ...)
if instanceof(class, AbstractValue) then if instanceof(class, AbstractValue) then
@ -813,7 +818,7 @@ function AbstractSection.parse_optionals(self, section)
local field = self.map:formvalue("cbi.opt."..self.config.."."..section) local field = self.map:formvalue("cbi.opt."..self.config.."."..section)
for k,v in ipairs(self.children) do for k,v in ipairs(self.children) do
if v.optional and not v:cfgvalue(section) and not next(self.tabs) then if v.optional and not v:cfgvalue(section) and not self:has_tabs() then
if field == v.option then if field == v.option then
field = nil field = nil
self.map.proceed = true self.map.proceed = true
@ -1290,7 +1295,7 @@ end
-- Render if this value exists or if it is mandatory -- Render if this value exists or if it is mandatory
function AbstractValue.render(self, s, scope) function AbstractValue.render(self, s, scope)
if not self.optional or next(self.section.tabs) or self:cfgvalue(s) or self:formcreated(s) then if not self.optional or self.section:has_tabs() or self:cfgvalue(s) or self:formcreated(s) then
scope = scope or {} scope = scope or {}
scope.section = s scope.section = s
scope.cbid = self:cbid(s) scope.cbid = self:cbid(s)