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

Initial report template editor (wip)

Browse source
This commit is contained in:
Alfredo Cardigliano 2023-12-07 16:24:41 +01:00
parent c7da0b85c1
commit f52ba41602
20 changed files with 895 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/lua/modules/lua_utils_generic.lua
View file

@ -108,7 +108,7 @@ end
-- Merges table a and table b into a new table. If some elements are presents in
-- both a and b, b elements will have precedence.
-- NOTE: this does *not* perform a deep merge. Only first level is merged.
function table.merge(a, b)
function table.merge(a, b, nodup)
local merged = {}
a = a or {}
b = b or {}
@ -117,7 +117,9 @@ function table.merge(a, b)
-- index based tables
for _, t in ipairs({a, b}) do
for _,v in pairs(t) do
merged[#merged + 1] = v
if not nodup or not table.contains(merged, v) then
merged[#merged + 1] = v
end
end
end
else