From: Jo-Philipp Wich <redacted>
Date: Thu, 10 Nov 2022 21:33:38 +0000 (+0100)
Subject: luci-lua-runtime: dispatcher.lua: translate legacy node "target" property
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=1da816ddf2b811ae98b5c05f1dbf84653071873e;p=openwrt-luci.git

luci-lua-runtime: dispatcher.lua: translate legacy node "target" property

Some legacy Lua controllers declare menu entries by first invoking `node()`
and then setting the `.target` property on the resulting object.

Make sure to properly translate such menu nodes into the internal menu
JSON representation.

Fixes: #6090
Signed-off-by: Jo-Philipp Wich <redacted>
---

diff --git a/modules/luci-lua-runtime/luasrc/dispatcher.lua b/modules/luci-lua-runtime/luasrc/dispatcher.lua
index cd850aa365..5c349114c4 100644
--- a/modules/luci-lua-runtime/luasrc/dispatcher.lua
+++ b/modules/luci-lua-runtime/luasrc/dispatcher.lua
@@ -186,6 +186,11 @@ function process_lua_controller(path)
 			entry.auth = {}
 		end
 
+		if entry.action == nil and type(entry.target) == "table" then
+			entry.action = entry.target
+			entry.target = nil
+		end
+
 		entry.leaf = nil
 
 		entry.file_depends = nil