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

libs/cbi: Fix option initialisation errors

Browse source
This commit is contained in:
Steven Barth 2008-09-14 21:58:55 +00:00
parent 1bd4697acd
commit d0442f8aab
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -872,10 +872,10 @@ function AbstractValue.__init__(self, map, section, option, ...)
self.tag_reqerror = {} self.tag_reqerror = {}
self.tag_error = {} self.tag_error = {}
self.deps = {} self.deps = {}
self.cast = "string" --self.cast = "string"
self.track_missing = false self.track_missing = false
self.rmempty = false --self.rmempty = false
self.default = nil self.default = nil
self.size = nil self.size = nil
self.optional = false self.optional = false
@ -886,11 +886,17 @@ function AbstractValue.prepare(self)
if not self.override_scheme if not self.override_scheme
and self.map:get_scheme(self.section.sectiontype, self.option) then and self.map:get_scheme(self.section.sectiontype, self.option) then
local vs = self.map:get_scheme(self.section.sectiontype, self.option) local vs = self.map:get_scheme(self.section.sectiontype, self.option)
self.rmempty = not vs.required if self.rmempty == nil then
self.cast = (vs.type == "list") and "list" or "string" self.rmempty = not vs.required
end
if self.cast == nil then
self.cast = (vs.type == "list") and "list" or "string"
end
self.title = self.title or vs.title self.title = self.title or vs.title
self.description = self.description or vs.descr self.description = self.description or vs.descr
self.default = vs.default if self.default == nil then
self.default = vs.default
end
if vs.depends and not self.override_dependencies then if vs.depends and not self.override_dependencies then
for i, deps in ipairs(vs.depends) do for i, deps in ipairs(vs.depends) do
@ -901,6 +907,8 @@ function AbstractValue.prepare(self)
end end
end end
end end
self.cast = self.cast or "string"
end end
-- Add a dependencie to another section field -- Add a dependencie to another section field