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-6483-bug-en-la-recursion-de-grupos-del-item-group-report-de-informes' into 'develop' 

Ent 6483 bug en la recursion de grupos del item group report de informes

See merge request artica/pandorafms!3549
This commit is contained in:
Daniel Rodriguez 2020-10-29 14:56:04 +01:00
parent 4f3e09c6c3 5d69ca3126
commit a7a2bdf831
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pandora_console/include/functions_reporting.php
View File

@ -2972,7 +2972,11 @@ function reporting_group_report($report, $content)
$return['data']['count_events'] = count($events); $return['data']['count_events'] = count($events);
$return['data']['group_stats'] = reporting_get_group_stats($content['id_group']); $return['data']['group_stats'] = reporting_get_group_stats(
$content['id_group'],
'AR',
(bool) $content['recursion']
);
if ($config['metaconsole']) { if ($config['metaconsole']) {
metaconsole_restore_db(); metaconsole_restore_db();
@ -9066,7 +9070,7 @@ function reporting_get_agents_detailed_event(
* *
* @return array Group statistics * @return array Group statistics
*/ */
function reporting_get_group_stats($id_group=0, $access='AR') function reporting_get_group_stats($id_group=0, $access='AR', $recursion=true)
{ {
global $config; global $config;
@ -9168,16 +9172,19 @@ function reporting_get_group_stats($id_group=0, $access='AR')
// Store the groups where we are quering // Store the groups where we are quering
$covered_groups = []; $covered_groups = [];
$group_array = []; $group_array = [];
foreach ($id_group as $group) {
$children = groups_get_children($group);
// Show empty groups only if they have children with agents foreach ($id_group as $group) {
// $group_array = array(); if ($recursion === true) {
foreach ($children as $sub) { $children = groups_get_children($group);
// If the group is quering previously, we ingore it
if (!in_array($sub['id_grupo'], $covered_groups)) { // Show empty groups only if they have children with agents
array_push($covered_groups, $sub['id_grupo']); // $group_array = array();
array_push($group_array, $sub['id_grupo']); foreach ($children as $sub) {
// If the group is quering previously, we ingore it
if (!in_array($sub['id_grupo'], $covered_groups)) {
array_push($covered_groups, $sub['id_grupo']);
array_push($group_array, $sub['id_grupo']);
}
} }
} }