Merge pull request #3517 from Ansuel/ubus_short

[oweals/luci.git] / modules / luci-base / luasrc / dispatcher.lua

diff --git a/modules/luci-base/luasrc/dispatcher.lua b/modules/luci-base/luasrc/dispatcher.lua
index 8dac8d6b6e65effe7c972e2ce61f210f2d68b594..48e125e4ae5cda3a890e302d93502c6f555b5b39 100644 (file)
--- a/modules/luci-base/luasrc/dispatcher.lua
+++ b/modules/luci-base/luasrc/dispatcher.lua
@@ -623,6 +623,14 @@ local function merge_trees(node_a, node_b)
                        node_a[k] = v
                end
        end
+
+       if type(node_a.action) == "table" and
+          node_a.action.type == "firstchild" and
+          node_a.children == nil
+       then
+               node_a.satisfied = false
+       end
+
        return node_a
 end