luci-base: dispatcher: remove empty firstchild nodes from menu
authorJo-Philipp Wich <jo@mein.io>
Fri, 10 Jan 2020 21:12:03 +0000 (22:12 +0100)
committerJo-Philipp Wich <jo@mein.io>
Fri, 10 Jan 2020 21:13:27 +0000 (22:13 +0100)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
modules/luci-base/luasrc/dispatcher.lua

index 8dac8d6b6e65effe7c972e2ce61f210f2d68b594..48e125e4ae5cda3a890e302d93502c6f555b5b39 100644 (file)
@@ -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