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

[Secondary groups] Fixed group agents and group events in events filter

This commit is contained in:
fermin831 2018-08-08 13:17:03 +02:00
parent 323599f50e
commit 62617e609c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_events.php
View File

@ -147,7 +147,7 @@ function events_get_events_grouped($sql_post, $offset = 0,
db_process_sql ('SET group_concat_max_len = 9999999'); db_process_sql ('SET group_concat_max_len = 9999999');
if ($total) { if ($total) {
$sql = "SELECT COUNT(*) FROM (SELECT * $sql = "SELECT COUNT(*) FROM (SELECT *
FROM $table te LEFT JOIN tagent_secondary_group tasg ON te.id_grupo = tasg.id_group FROM $table te LEFT JOIN tagent_secondary_group tasg ON te.id_agente = tasg.id_agent
WHERE 1=1 " . $sql_post . " WHERE 1=1 " . $sql_post . "
GROUP BY estado, evento, id_agente, id_agentmodule" . $groupby_extra . ") AS t"; GROUP BY estado, evento, id_agente, id_agentmodule" . $groupby_extra . ") AS t";
} }
@ -163,7 +163,7 @@ function events_get_events_grouped($sql_post, $offset = 0,
(SELECT criticity FROM $table WHERE id_evento = MAX(te.id_evento)) AS criticity, (SELECT criticity FROM $table WHERE id_evento = MAX(te.id_evento)) AS criticity,
(SELECT ack_utimestamp FROM $table WHERE id_evento = MAX(te.id_evento)) AS ack_utimestamp, (SELECT ack_utimestamp FROM $table WHERE id_evento = MAX(te.id_evento)) AS ack_utimestamp,
(SELECT nombre FROM tagente_modulo WHERE id_agente_modulo = te.id_agentmodule) AS module_name (SELECT nombre FROM tagente_modulo WHERE id_agente_modulo = te.id_agentmodule) AS module_name
FROM $table te LEFT JOIN tagent_secondary_group tasg ON te.id_grupo = tasg.id_group FROM $table te LEFT JOIN tagent_secondary_group tasg ON te.id_agente = tasg.id_agent
WHERE 1=1 " . $sql_post . " WHERE 1=1 " . $sql_post . "
GROUP BY estado, evento, id_agente, id_agentmodule" . $groupby_extra . " GROUP BY estado, evento, id_agente, id_agentmodule" . $groupby_extra . "
ORDER BY "; ORDER BY ";
@ -3458,7 +3458,7 @@ function events_get_events_grouped_by_agent($sql_post, $offset = 0,
} }
else { else {
$sql = "select id_agente, count(*) as total$fields_extra from $table te LEFT JOIN tagent_secondary_group tasg $sql = "select id_agente, count(*) as total$fields_extra from $table te LEFT JOIN tagent_secondary_group tasg
ON te.id_grupo = tasg.id_group ON te.id_agente = tasg.id_agent
WHERE id_agente > 0 $sql_post GROUP BY id_agente$groupby_extra ORDER BY id_agente LIMIT $offset,$pagination"; WHERE id_agente > 0 $sql_post GROUP BY id_agente$groupby_extra ORDER BY id_agente LIMIT $offset,$pagination";
} }

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

@ -43,11 +43,11 @@ if ($id_group > 0) {
else { else {
$childrens_ids = array_keys($groups); $childrens_ids = array_keys($groups);
} }
//Group selection //Group selection
if ($id_group > 0 && in_array ($id_group, array_keys ($groups))) { if ($id_group > 0 && in_array ($id_group, array_keys ($groups))) {
if ($propagate) { if ($propagate) {
$sql_post = " AND id_grupo IN (" . implode(',', $childrens_ids) . ")"; $childrens_str = implode(',', $childrens_ids);
$sql_post = " AND (id_grupo IN ($childrens_str) OR id_group IN ($childrens_str))";
} }
else { else {
//If a group is selected and it's in the groups allowed //If a group is selected and it's in the groups allowed