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 e265589..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
-               node = load(node)
+               node = load(node, name)
        end
 
        if type(node) == "table" and getmetatable(node) == nil then
@@ -617,8 +617,12 @@ function Delegator.parse(self, ...)
                self.active = self:get(self.current)
                if type(self.active) ~= "function" then
                        self.active:populate_delegator(self)
-                       self.active:parse(false)
-                       return FROM_PROCEED
+                       local stat = self.active:parse(false)
+                       if stat == FORM_SKIP then
+                               return self:parse(...)
+                       else
+                               return FORM_PROCEED
+                       end
                else
                        return self:parse(...)
                end