summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-base/htdocs/luci-static/resources
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2021-07-28 09:00:16 +0200
committerJo-Philipp Wich <jo@mein.io>2021-10-11 20:38:04 +0200
commite4d24f07c9e641a18aede2f556bee4361b7a7af6 (patch)
tree1b8642b315aa85a74b86b7fb01bfe8fe5f2112f6 /modules/luci-base/htdocs/luci-static/resources
parentea9b5e87e6ec3fbab52a02ab5f18bb51292bd249 (diff)
luci-base: dispatcher: rework dispatching and menu filtering logic
- Prefer nodes that do not require authentication over nodes that do - Honour ACL dependencies while resolving firstchild nodes - Consider currently active session while scanning menu tree instead of only loading effective ACLs when a login node is encountered - Do not consider nodes for firstchild dispatching which specify a special "firstchild_ineligible" property - Hide menu nodes that have no accessible children Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-base/htdocs/luci-static/resources')
-rw-r--r--modules/luci-base/htdocs/luci-static/resources/ui.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/ui.js b/modules/luci-base/htdocs/luci-static/resources/ui.js
index 0e909b6dcc..9cc62c12db 100644
--- a/modules/luci-base/htdocs/luci-static/resources/ui.js
+++ b/modules/luci-base/htdocs/luci-static/resources/ui.js
@@ -3021,7 +3021,7 @@ function scrubMenu(node) {
for (var k in node.children) {
var child = scrubMenu(node.children[k]);
- if (child.title)
+ if (child.title && !child.firstchild_ineligible)
hasSatisfiedChild = hasSatisfiedChild || child.satisfied;
}
}