From 9271dc33f19f9740839be3e3ee51242735d1dbbd Mon Sep 17 00:00:00 2001
From: Pablo Aragon <pablo.aragon@pandorafms.com>
Date: Thu, 24 Aug 2023 14:43:05 +0200
Subject: [PATCH] 11821-Events not sort by comments

---
 pandora_console/include/functions_ui.php    | 13 +++++++++++--
 pandora_console/operation/events/events.php |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index ec072735c7..d43f367dfd 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3913,6 +3913,15 @@ function ui_print_datatable(array $parameters)
         $parameters['toggle_collapsed'] = true;
     }
 
+    $columns_tmp = [];
+    foreach ($parameters['columns'] as $k_column => $v_column) {
+        if (isset($parameters['columns'][$k_column]['text']) === true) {
+            array_push($columns_tmp, $v_column['text']);
+        } else {
+            array_push($columns_tmp, $v_column);
+        }
+    }
+
     if (!is_array($parameters['order'])) {
         $order = 0;
         $direction = 'asc';
@@ -3926,7 +3935,7 @@ function ui_print_datatable(array $parameters)
         } else {
             $order = array_search(
                 $parameters['order']['field'],
-                $parameters['columns']
+                $columns_tmp
             );
 
             if ($order === false) {
@@ -3943,7 +3952,7 @@ function ui_print_datatable(array $parameters)
     foreach ($parameters['no_sortable_columns'] as $key => $find) {
         $found = array_search(
             $parameters['no_sortable_columns'][$key],
-            $parameters['columns']
+            $columns_tmp
         );
 
         if ($found !== false) {
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 0152fea782..19ac9e2015 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -2728,6 +2728,7 @@ try {
                         -1,
                         -2,
                         'column-instructions',
+                        'user_comment',
                     ],
                     'ajax_return_operation'          => 'buffers',
                     'ajax_return_operation_function' => 'process_buffers',