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

Rework user script working sets (a single configset is supported now)

Browse source
This commit is contained in:
Alfredo Cardigliano 2021-03-01 15:37:45 +01:00
parent 03512b963f
commit fa311e3ade
45 changed files with 259 additions and 1077 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/lua/admin/edit_user_script.lua
View file

@ -46,10 +46,9 @@ page_utils.set_active_menu_entry(page_utils.menu_entries.scripts_config)
dofile(dirs.installdir .. "/scripts/lua/inc/menu.lua")
local script_subdir = _GET["subdir"]
local confset_id = _GET["confset_id"]
local script_key = _GET["script_key"]
local configset = user_scripts.getConfigsets()[tonumber(confset_id)]
local configset = user_scripts.getConfigset()
local script_type = user_scripts.getScriptType(script_subdir)
local selected_script = user_scripts.loadModule(getSystemInterfaceId(), script_type, script_subdir, script_key)
local script_title = i18n(selected_script.gui.i18n_title) or selected_script.gui.i18n_title
@ -66,7 +65,7 @@ local generated_breadcrumb = ui_utils.render_breadcrumb(i18n("about.user_scripts
label = titles[script_subdir],
},
{
href = ntop.getHttpPrefix() .. "/lua/admin/edit_configset.lua?confset_id=" .. confset_id .. "&subdir=" .. script_subdir,
href = ntop.getHttpPrefix() .. "/lua/admin/edit_configset.lua?subdir=" .. script_subdir,
label = i18n("scripts_list.config", {}) .. " " .. confset_name
},
{
@ -88,7 +87,6 @@ local base_context = {
hooks_config = hooks_config,
script_subdir = script_subdir,
confset_id = confset_id,
script_key = script_key,
filters = format_exclusion_list_filters(user_scripts.getDefaultFilters(interface.getId(), script_subdir, script_key))
}
@ -96,4 +94,4 @@ local base_context = {
print(template.gen("pages/edit_user_script.template", base_context))
dofile(dirs.installdir .. "/scripts/lua/inc/footer.lua")
dofile(dirs.installdir .. "/scripts/lua/inc/footer.lua")