X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fcbi%2Fluasrc%2Fcbi.lua;h=9b947cb2f0fe841dacab2316c334e6732db2c54c;hp=5a1d923853381cb8b8cbe952b3dc3f806d83af9e;hb=23e0a7da6a698072871081364e8c7edf76a36f32;hpb=7aed1e4b9d3d608389a8b15ea800b8e75be967ef diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua index 5a1d923853..9b947cb2f0 100644 --- a/libs/cbi/luasrc/cbi.lua +++ b/libs/cbi/luasrc/cbi.lua @@ -519,10 +519,6 @@ function Delegator.__init__(self, ...) end function Delegator.set(self, name, node) - if type(node) == "table" and getmetatable(node) == nil then - node = Compound(unpack(node)) - end - assert(type(node) == "function" or instanceof(node, Compound), "Invalid") assert(not self.nodes[name], "Duplicate entry") self.nodes[name] = node @@ -562,7 +558,17 @@ function Delegator.set_route(self, ...) end function Delegator.get(self, name) - return self.nodes[name] + local node = self.nodes[name] + + if type(node) == "string" then + node = load(node) + end + + if type(node) == "table" and getmetatable(node) == nil then + node = Compound(unpack(node)) + end + + return node end function Delegator.parse(self, ...)