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:
commit
8d7b02069a
|
@ -101,9 +101,8 @@ if ($get_comments === true) {
|
|||
if (isset($event_rep) === true && $event_rep > 0) {
|
||||
// Default grouped message filtering (evento and estado).
|
||||
$whereGrouped = sprintf(
|
||||
'`evento` = "%s" AND `estado` = "%s"',
|
||||
$event['evento'],
|
||||
$event['estado']
|
||||
'`evento` = "%s"',
|
||||
$event['evento']
|
||||
);
|
||||
|
||||
// If id_agente is reported, filter the messages by them as well.
|
||||
|
|
|
@ -1401,7 +1401,7 @@ function events_get_all(
|
|||
|
||||
case '1':
|
||||
// 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;
|
||||
|
||||
case '2':
|
||||
|
|
Loading…
Reference in New Issue