Changeset 6131

Timestamp:

04/27/10 08:25:20 (3 years ago)

Author:

jow

Message:

libs/cbi: fix crash with tabless sections

Files:

• luci/trunk/libs/cbi/luasrc/cbi.lua (modified) (3 diffs)

luci/trunk/libs/cbi/luasrc/cbi.lua

@@ -765 +765 @@
 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
 function AbstractSection.option(self, class, option, ...)
@@ -814 +819 @@
     local field = self.map:formvalue("cbi.opt."..self.config.."."..section)
     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
                 field = nil
@@ -1291 +1296 @@
 -- Render if this value exists or if it is mandatory
 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.section   = s