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

Merge branch '1324-Nombre-del-agente-erróneo-en-los-eventos-generados-por-cambio-de-inventario-dev' into 'develop' 

group by id_agent in group events

See merge request !866
This commit is contained in:
vgilc 2017-10-04 17:43:39 +02:00
parent d181edc471 7a061edb66
commit e1cefdb84f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_events.php
View File

@ -146,7 +146,7 @@ function events_get_events_grouped($sql_post, $offset = 0,
$sql = "SELECT COUNT(*) FROM (SELECT *
FROM $table te
WHERE 1=1 " . $sql_post . "
GROUP BY estado, evento, id_agentmodule" . $groupby_extra . ") AS t";
GROUP BY estado, evento, id_agente, id_agentmodule" . $groupby_extra . ") AS t";
}
else {
$sql = "SELECT *, MAX(id_evento) AS id_evento,
@ -161,7 +161,7 @@ function events_get_events_grouped($sql_post, $offset = 0,
(SELECT ack_utimestamp FROM $table WHERE id_evento = MAX(te.id_evento)) AS ack_utimestamp
FROM $table te
WHERE 1=1 " . $sql_post . "
GROUP BY estado, evento, id_agentmodule" . $groupby_extra . "
GROUP BY estado, evento, id_agente, id_agentmodule" . $groupby_extra . "
ORDER BY timestamp_rep " . $order . " LIMIT " . $offset . "," . $pagination;
}
break;