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

Do not redirect after alerts actions

Browse source
This commit is contained in:
emanuele-f 2016-12-02 18:59:46 +01:00
parent b3c0f42b74
commit 05578243dd
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

38
scripts/lua/modules/alert_utils.lua
View file

@ -638,6 +638,22 @@ end
-- #################################
function getExtraParameters(url_params)
local params = {}
if type(url_params) == "table" then
for k, v in pairs(url_params) do
if ((k ~= "csrf") and (k ~= "older_than_seconds") and (k ~= "tab_id")) then
params[k] = v
end
end
end
return params
end
-- #################################
function checkDeleteStoredAlerts()
if(_GET["csrf"] ~= nil) then
if(_GET["id_to_delete"] ~= nil) then
@ -697,9 +713,6 @@ function checkDeleteStoredAlerts()
end
end
end
-- keeping old CSRF is annoying, just go backward
print("<script>window.history.back();</script>")
end
end
@ -856,12 +869,8 @@ function updateDeleteContext(tabid) {
-- This possibly passes some parameters to the search query
local url_extra_params = ""
if type(url_params) == "table" then
for k, v in pairs(url_params) do
if ((k ~= "csrf") and (k ~= "older_than_seconds") and (k ~= "tab_id")) then
url_extra_params = url_extra_params.."&"..k.."="..v
end
end
for k, v in pairs(getExtraParameters(url_params)) do
url_extra_params = url_extra_params.."&"..k.."="..v
end
@ -906,7 +915,7 @@ function updateDeleteContext(tabid) {
local host_ip = entity_val
local sp = split(host_ip, "@")
if #sp == 2 then
host_ip = sp[1]
host_ip = ntop.resolveAddress(sp[1])
end
title = title .. " - Host " .. host_ip
@ -1042,13 +1051,10 @@ $("[clicked=1]").trigger("click");
print('<input id="csrf" name="csrf" type="hidden" value="'..ntop.getRandomCSRFValue()..'" />\n')
-- This is required because of drawAlertTables integration in other complex pages
if type(url_params) == "table" then
for k, v in pairs(url_params) do
if ((k ~= "csrf") and (k ~= "older_than_seconds") and (k ~= "tab_id")) then
print('<input name="'..k..'" type="hidden" value="'..v..'"/>\n')
end
end
for k, v in pairs(getExtraParameters(url_params)) do
print('<input name="'..k..'" type="hidden" value="'..v..'"/>\n')
end
if entity ~= nil and entity ~= "" then
print('<input name="entity" type="hidden" value="'..entity..'"/>\n')
end