tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-5102-Recursividad-no-funciona-en-Group-event-report' into 'develop' 

fixed recursion in Group event report

See merge request artica/pandorafms!2969
This commit is contained in:
Daniel Rodriguez 2020-01-07 09:37:41 +01:00
parent 53ed9a52f4 9db5b2bead
commit efe1e78489
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pandora_console/include/functions_reporting.php
View File

@ -760,7 +760,7 @@ function reporting_make_reporting_data(
continue;
}
$report['contents'][] = $report_control;
$report['contents'][] = $report_control;
break;
case 'top_n':
@ -1775,6 +1775,27 @@ function reporting_event_report_group(
$event_graph_by_criticity = $event_filter['event_graph_by_criticity'];
$event_graph_validated_vs_unvalidated = $event_filter['event_graph_validated_vs_unvalidated'];
if (isset($content['recursion']) && $content['recursion'] == 1 && $content['id_group'] != 0) {
$propagate = db_get_value(
'propagate',
'tgrupo',
'id_grupo',
$content['id_group']
);
if ($propagate) {
$children = groups_get_children($content['id_group']);
$_groups = [ $content['id_group'] ];
if (!empty($children)) {
foreach ($children as $child) {
$_groups[] = (int) $child['id_grupo'];
}
}
$content['id_group'] = $_groups;
}
}
$data = events_get_agent(
false,
$content['period'],