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

User scripts templates fixes

Browse source
This commit is contained in:
emanuele-f 2020-01-23 15:02:48 +01:00
parent 1c8c93ff6e
commit b689f15f79
4 changed files with 46 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scripts/lua/modules/user_scripts.lua
View file

@ -935,16 +935,16 @@ function user_scripts.updateScriptConfig(confid, script_key, subdir, new_config)
local valid = true
local rv_or_err = ""
if(value.enabled == nil) then
if(conf.enabled == nil) then
return false, "Missing 'enabled' item"
end
if(value.script_conf == nil) then
if(conf.script_conf == nil) then
return false, "Missing 'script_conf' item"
end
if value.enabled then
valid, rv_or_err = script.template:parseConfig(script, value.script_conf)
if conf.enabled then
valid, rv_or_err = script.template:parseConfig(script, conf.script_conf)
end
if(not valid) then
@ -952,7 +952,8 @@ function user_scripts.updateScriptConfig(confid, script_key, subdir, new_config)
end
-- The validator may have changed the configuration
applied_config[hook] = rv_or_err
conf.script_conf = rv_or_err
applied_config[hook] = conf
end
end