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-8043-eventos-solo-se-agrupan-si-tienen-el-mismo-estado' into 'develop' 

not group by event status pandora_enterprise#8043

pandora_enterprise#8043

See merge request artica/pandorafms!5031
This commit is contained in:
Jimmy Olano 2022-08-01 18:46:38 +00:00
parent 4cbd23d911 e11d46ea60
commit 8d7b02069a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/include/ajax/events.php
View File

@ -101,9 +101,8 @@ if ($get_comments === true) {
if (isset($event_rep) === true && $event_rep > 0) { if (isset($event_rep) === true && $event_rep > 0) {
// Default grouped message filtering (evento and estado). // Default grouped message filtering (evento and estado).
$whereGrouped = sprintf( $whereGrouped = sprintf(
'`evento` = "%s" AND `estado` = "%s"', '`evento` = "%s"',
$event['evento'], $event['evento']
$event['estado']
); );
// If id_agente is reported, filter the messages by them as well. // If id_agente is reported, filter the messages by them as well.

2
pandora_console/include/functions_events.php
View File

@ -1401,7 +1401,7 @@ function events_get_all(
case '1': case '1':
// Group by events. // Group by events.
$group_by .= 'te.evento, te.id_agente, te.id_agentmodule, te.estado'; $group_by .= 'te.evento, te.id_agente, te.id_agentmodule';
break; break;
case '2': case '2':