projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NIU: Minor fixes
[project/luci.git]
/
libs
/
cbi
/
luasrc
/
cbi.lua
diff --git
a/libs/cbi/luasrc/cbi.lua
b/libs/cbi/luasrc/cbi.lua
index
9b947cb
..
c9db8be
100644
(file)
--- a/
libs/cbi/luasrc/cbi.lua
+++ b/
libs/cbi/luasrc/cbi.lua
@@
-561,7
+561,7
@@
function Delegator.get(self, name)
local node = self.nodes[name]
if type(node) == "string" then
local node = self.nodes[name]
if type(node) == "string" then
- node = load(node)
+ node = load(node
, name
)
end
if type(node) == "table" and getmetatable(node) == nil then
end
if type(node) == "table" and getmetatable(node) == nil then
@@
-616,8
+616,13
@@
function Delegator.parse(self, ...)
self.current = newcurrent or self.current
self.active = self:get(self.current)
if type(self.active) ~= "function" then
self.current = newcurrent or self.current
self.active = self:get(self.current)
if type(self.active) ~= "function" then
- self.active:parse(false)
- return FROM_PROCEED
+ self.active:populate_delegator(self)
+ local stat = self.active:parse(false)
+ if stat == FORM_SKIP then
+ return self:parse(...)
+ else
+ return FORM_PROCEED
+ end
else
return self:parse(...)
end
else
return self:parse(...)
end