vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 07:29:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Always return rendered user script templates in order

Browse source
This commit is contained in:
Simone Mainardi 2021-02-23 11:20:56 +01:00
parent 15d4672f7e
commit 6b75045a86
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/lua/modules/user_script_templates/user_script_template.lua
View file

@ -41,8 +41,14 @@ function user_script_template:render(hooks_conf)
local res = {}
local plugins_utils = require "plugins_utils"
for hook, hook_conf in pairs(hooks_conf) do
res[hook] = plugins_utils.renderTemplate(self._user_script.plugin.key, self._user_script.gui.input_builder..".template", hook_conf)
-- Use ipairs on script type hooks to make sure hooks are always returned sorted and in the same order
for _, hook in ipairs(table.merge({"all"} --[[ Hook "all" always go first --]], self._user_script.script_type.hooks)) do
local hook_conf = hooks_conf[hook]
-- If the hook is among those passed as parameter, add it to the result
if hook_conf then
res[#res + 1] = {hook = hook, template = plugins_utils.renderTemplate(self._user_script.plugin.key, self._user_script.gui.input_builder..".template", hook_conf)}
end
end
return res