projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
52a063c
)
libs/cbi: Cleaned up *Section.create
author
Steven Barth
<steven@midlink.org>
Wed, 16 Jul 2008 07:24:54 +0000
(07:24 +0000)
committer
Steven Barth
<steven@midlink.org>
Wed, 16 Jul 2008 07:24:54 +0000
(07:24 +0000)
libs/cbi/luasrc/cbi.lua
patch
|
blob
|
history
diff --git
a/libs/cbi/luasrc/cbi.lua
b/libs/cbi/luasrc/cbi.lua
index
6123e27
..
879717a
100644
(file)
--- a/
libs/cbi/luasrc/cbi.lua
+++ b/
libs/cbi/luasrc/cbi.lua
@@
-214,6
+214,7
@@
function AbstractSection.__init__(self, map, sectiontype, ...)
self.map = map
self.config = map.config
self.optionals = {}
self.map = map
self.config = map.config
self.optionals = {}
+ self.defaults = {}
self.optional = true
self.addremove = false
self.optional = true
self.addremove = false
@@
-303,7
+304,21
@@
end
-- Creates the section
function AbstractSection.create(self, section)
-- Creates the section
function AbstractSection.create(self, section)
- return self.map:set(section, nil, self.sectiontype)
+ local stat = self.map:set(section, nil, self.sectiontype)
+
+ if stat then
+ for k,v in pairs(self.children) do
+ if v.default then
+ self.map:set(section, v.option, v.default)
+ end
+ end
+
+ for k,v in pairs(self.defaults) do
+ self.map:set(section, k, v)
+ end
+ end
+
+ return stat
end
end
@@
-386,17
+401,8
@@
end
-- Creates a new section of this type with the given name (or anonymous)
function TypedSection.create(self, name)
-- Creates a new section of this type with the given name (or anonymous)
function TypedSection.create(self, name)
- if name then
- self.map:set(name, nil, self.sectiontype)
- else
- name = self.map:add(self.sectiontype)
- end
-
- for k,v in pairs(self.children) do
- if v.default then
- self.map:set(name, v.option, v.default)
- end
- end
+ name = name or self.map:add(self.sectiontype)
+ AbstractSection.create(self, name)
end
-- Limits scope to sections that have certain option => value pairs
end
-- Limits scope to sections that have certain option => value pairs