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-3735-Buguete-filtrado-de-eventos-por-grupo' into 'develop' 

fix bug in event filter by group when not using secondary groups

See merge request artica/pandorafms!2276

Former-commit-id: e414c5033fbcde1d97a28190170454080531ef34
This commit is contained in:
Alejandro Fraguas 2019-03-25 10:22:45 +01:00
parent 3916bcf636 c19ec2b041
commit 5411eb9d17
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pandora_console/operation/events/events.build_query.php
View File

@ -83,22 +83,42 @@ if (($date_from === '') && ($date_to === '')) {
}
}
$is_using_secondary_group = enterprise_hook('agents_is_using_secondary_groups');
// Group selection.
if ($id_group > 0 && in_array($id_group, array_keys($groups))) {
if ($propagate) {
$childrens_str = implode(',', $childrens_ids);
$sql_post .= " AND (id_grupo IN ($childrens_str) OR id_group IN ($childrens_str))";
$sql_post .= " AND (id_grupo IN ($childrens_str)";
if ($is_using_secondary_group === 1)
$sql_post .= " OR id_group IN ($childrens_str)";
$sql_post .= ")";
} else {
// If a group is selected and it's in the groups allowed.
$sql_post .= " AND (id_grupo = $id_group OR id_group = $id_group)";
$sql_post .= " AND (id_grupo = $id_group";
if ($is_using_secondary_group === 1)
$sql_post .= " OR id_group = $id_group";
$sql_post .= ")";
}
} else {
if (!users_is_admin() && !users_can_manage_group_all('ER')) {
$sql_post .= sprintf(
' AND (id_grupo IN (%s) OR id_group IN (%s)) ',
implode(',', array_keys($groups)),
implode(',', array_keys($groups))
);
if ($is_using_secondary_group === 1) {
$sql_post .= sprintf(
' AND (id_grupo IN (%s) OR id_group IN (%s)) ',
implode(',', array_keys($groups)),
implode(',', array_keys($groups))
);
}
else {
$sql_post .= sprintf(
' AND (id_grupo IN (%s)) ',
implode(',', array_keys($groups))
);
}
}
}