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-9305-comentarios-se-agrupan-incorrectamente-en-vista-de-eventos' into 'develop' 

fix error custom data show all in tab events pandora_enterprise#9305

pandora_enterprise#9305

See merge request artica/pandorafms!5028
This commit is contained in:
Jimmy Olano 2022-07-31 22:20:00 +00:00
parent f4c686844b bdd9612812
commit 1b07631f5f
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,6 +90,7 @@ $node_id = (int) get_parameter('node_id', 0);
if ($get_comments === true) { if ($get_comments === true) {
$event = get_parameter('event', false); $event = get_parameter('event', false);
$event_rep = get_parameter('event_rep', false);
if ($event === false) { if ($event === false) {
return __('Failed to retrieve comments'); return __('Failed to retrieve comments');
} }
@ -97,27 +98,30 @@ if ($get_comments === true) {
$eventsGrouped = []; $eventsGrouped = [];
// Consider if the event is grouped. // Consider if the event is grouped.
$whereGrouped = '1=1'; $whereGrouped = '1=1';
// Default grouped message filtering (evento and estado). if (isset($event_rep) === true && $event_rep > 0) {
$whereGrouped = sprintf( // Default grouped message filtering (evento and estado).
'`evento` = "%s" AND `estado` = "%s" AND `event_type` = "%s" ', $whereGrouped = sprintf(
$event['evento'], '`evento` = "%s" AND `estado` = "%s"',
$event['estado'], $event['evento'],
$event['event_type'] $event['estado']
);
// If id_agente is reported, filter the messages by them as well.
if ((int) $event['id_agente'] > 0) {
$whereGrouped .= sprintf(
' AND `id_agente` = %d',
(int) $event['id_agente']
); );
}
if ((int) $event['id_agentmodule'] > 0) { // If id_agente is reported, filter the messages by them as well.
$whereGrouped .= sprintf( if ((int) $event['id_agente'] > 0) {
' AND `id_agentmodule` = %d', $whereGrouped .= sprintf(
(int) $event['id_agentmodule'] ' AND `id_agente` = %d',
); (int) $event['id_agente']
);
}
if ((int) $event['id_agentmodule'] > 0) {
$whereGrouped .= sprintf(
' AND `id_agentmodule` = %d',
(int) $event['id_agentmodule']
);
}
} else {
$whereGrouped = sprintf('`id_evento` = %d', $event['id_evento']);
} }
try { try {
@ -1629,7 +1633,7 @@ if ($get_extended_event) {
$filter = get_parameter('filter', []); $filter = get_parameter('filter', []);
$similar_ids = get_parameter('similar_ids', $event_id); $similar_ids = get_parameter('similar_ids', $event_id);
$group_rep = $filter['group_rep']; $group_rep = $filter['group_rep'];
$event_rep = $event['event_rep']; $event_rep = $group_rep;
$timestamp_first = $event['timestamp_first']; $timestamp_first = $event['timestamp_first'];
$timestamp_last = $event['timestamp_last']; $timestamp_last = $event['timestamp_last'];
$server_id = $event['server_id']; $server_id = $event['server_id'];
@ -1964,7 +1968,8 @@ if ($get_extended_event) {
data : { data : {
page: "include/ajax/events", page: "include/ajax/events",
get_comments: 1, get_comments: 1,
event: '.json_encode($event).' event: '.json_encode($event).',
event_rep: '.$event_rep.'
}, },
dataType : "html", dataType : "html",
success: function (data) { success: function (data) {