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

Fixes flows dropdown filters not shown in the title

Browse source 
Fixes #5055
This commit is contained in:
Simone Mainardi 2021-02-22 14:57:34 +01:00
parent 7ababe88df
commit 275482e203
2 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

43
scripts/lua/modules/flow_utils.lua
View file

@ -1942,6 +1942,7 @@ end
-- #######################
function getFlowsTableTitle()
local active_msg = ""
local status_type
if _GET["flow_status"] then
@ -1950,27 +1951,31 @@ function getFlowsTableTitle()
if(flow_status_id ~= nil) then
status_type = alert_consts.statusTypeLabel(tonumber(_GET["flow_status"]), true)
else
status_type = _GET["flow_status"]
status_type = firstToUpper(_GET["flow_status"])
end
end
local filter = (_GET["application"] or _GET["category"] or _GET["vhost"] or status_type or "")
local active_msg = ""
local filter_msg = ""
if _GET["flow_status_severity"] then
local flow_status_severity = _GET["flow_status_severity"]
if not isEmptyString(filter) then
filter_msg = i18n("flows_page."..filter)
if isEmptyString(filter_msg) then
filter_msg = firstToUpper(filter)
end
local s = alert_consts.severity_groups[flow_status_severity]
active_msg = active_msg .. " ".. i18n(s.i18n_title)
end
if not interface.isPacketInterface() then
active_msg = i18n("flows_page.recently_active_flows", {filter=filter_msg})
elseif interface.isPcapDumpInterface() then
active_msg = i18n("flows_page.flows", {filter=filter_msg})
else
active_msg = i18n("flows_page.active_flows", {filter=filter_msg})
if _GET["application"] then
active_msg = active_msg .. " ".. _GET["application"]
end
if _GET["category"] then
active_msg = active_msg .. " " .. _GET["category"]
end
if _GET["vhost"] then
active_msg = active_msg .. " " .. _GET["vhost"]
end
if status_type then
active_msg = active_msg .. " " .. status_type
end
if(_GET["network_name"] ~= nil) then
@ -2021,6 +2026,14 @@ function getFlowsTableTitle()
active_msg = active_msg .. " ["..tcp_flow_state_utils.state2i18n(_GET["tcp_flow_state"]).."]"
end
if not interface.isPacketInterface() then
active_msg = i18n("flows_page.recently_active_flows", {filter = active_msg})
elseif interface.isPcapDumpInterface() then
active_msg = i18n("flows_page.flows", {filter = active_msg})
else
active_msg = i18n("flows_page.active_flows", {filter = active_msg})
end
return active_msg
end