From 84fbf0e3dd6ee14dd50459ee0360fcffb4d173dc Mon Sep 17 00:00:00 2001
From: Daniel Barbero Martin <daniel.barbero@artica.es>
Date: Mon, 18 Jul 2022 16:44:31 +0200
Subject: [PATCH] double refresh page events pandora_enterprise#9279

---
 pandora_console/general/header.php          |  4 ++-
 pandora_console/operation/events/events.php | 32 +++++++++++----------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index 7384ac17ff..f72c9f19bc 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -925,7 +925,9 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
                         layout: '%M%nn%M:%S%nn%S',
                         labels: ['', '', '', '', '', '', ''],
                         onExpiry: function () {
-                            dt_events.draw(false);
+                            $("#table_events")
+                                .DataTable()
+                                .draw(false);
                         }
                     });
                 }
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 781301e2e0..52997e50e4 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -482,21 +482,23 @@ if (is_ajax() === true) {
                         $tmp->b64 = base64_encode(json_encode($tmp));
 
                         // Show comments events.
-                        $tmp->user_comment = $tmp->comments;
-                        if ($tmp->comments !== 'undefined' && strlen($tmp->comments) > 80) {
-                            $tmp->user_comment .= '&nbsp;&nbsp;';
-                            $tmp->user_comment .= '<a id="show_comments" href="javascript:" onclick="show_event_dialog(\'';
-                            $tmp->user_comment .= $tmp->b64;
-                            $tmp->user_comment .= '\',\'comments\')>;';
-                            $tmp->user_comment .= html_print_image(
-                                'images/operation.png',
-                                true,
-                                [
-                                    'title' => __('Show more'),
-                                    'class' => 'invert_filter',
-                                ]
-                            );
-                            $tmp->user_comment .= '</a>';
+                        if (empty($tmp->comments) === false) {
+                            $tmp->user_comment = $tmp->comments;
+                            if ($tmp->comments !== 'undefined' && strlen($tmp->comments) > 80) {
+                                $tmp->user_comment .= '&nbsp;&nbsp;';
+                                $tmp->user_comment .= '<a id="show_comments" href="javascript:" onclick="show_event_dialog(\'';
+                                $tmp->user_comment .= $tmp->b64;
+                                $tmp->user_comment .= '\',\'comments\')>;';
+                                $tmp->user_comment .= html_print_image(
+                                    'images/operation.png',
+                                    true,
+                                    [
+                                        'title' => __('Show more'),
+                                        'class' => 'invert_filter',
+                                    ]
+                                );
+                                $tmp->user_comment .= '</a>';
+                            }
                         }
 
                         // Grouped events.