vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-04 18:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Exclusion list now accepts a simple comma-separated list which is more user friendly (fix #5213)

Browse source
This commit is contained in:
Alfredo Cardigliano 2021-05-11 11:52:19 +02:00
parent 9b34a17b34
commit 72ec8ac12e
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
httpdocs/js/config_callbacks/scripts-list-utils.js
View file

@ -314,7 +314,18 @@ const get_unit_times = (seconds) => {
function getSanitizedScriptExList(script_exclusion_list) {
var ex_list_purified;
ex_list_purified = script_exclusion_list.split("\n").join(";");
// IP only are supported at the moment, values are listed without <name>=
// as this is more intuitive for the user, however the backend
// handles <name>=<value> (see also appendExclusionList)
//ex_list_purified = script_exclusion_list.split("\n").join(";");
ex_list_purified = script_exclusion_list.split(" ").join("");
ex_list_purified = ex_list_purified.split("\n").join("");
if (ex_list_purified.length > 0)
ex_list_purified = "ip="+ex_list_purified;
ex_list_purified = ex_list_purified.split(",").join(";ip=");
return ex_list_purified.split(" ").join("");
}
@ -1466,12 +1477,17 @@ function appendExclusionList(data) {
// Temporary check, needs to be removed in a few time
continue;
}
ex_list_str = ex_list_str + name + "=" + value + ",";
// IP only are supported at the moment, just list the values without <name>=
// as this is more intuitive for the user
//ex_list_str = ex_list_str + name + "=" + value + ",";
ex_list_str = ex_list_str + value + ",";
}
ex_list_str = ex_list_str.slice(0, -1);
ex_list_str = ex_list_str + "\n";
//ex_list_str = ex_list_str.slice(0, -1);
//ex_list_str = ex_list_str + "\n";
}
if (ex_list_str.length > 0)
ex_list_str = ex_list_str.slice(0, -1);
}
}