From 5c047fc1b54f14d159f8e52249f0d42937b89cae Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Mon, 18 Dec 2023 14:46:44 +0100
Subject: [PATCH] #12657 entries order function datatables

---
 pandora_console/include/javascript/datatablesFunction.js | 5 +++++
 pandora_console/operation/events/events.php              | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/javascript/datatablesFunction.js b/pandora_console/include/javascript/datatablesFunction.js
index 34fe301f41..b517830ce9 100644
--- a/pandora_console/include/javascript/datatablesFunction.js
+++ b/pandora_console/include/javascript/datatablesFunction.js
@@ -66,6 +66,11 @@ if (typeof dt.pagination_options !== "undefined") {
   lengthMenu = dt.pagination_options;
 }
 
+if (dt.pagination_options_order === "true") {
+  lengthMenu[0] = lengthMenu[0].sort((a, b) => a - b);
+  lengthMenu[1] = lengthMenu[1].sort((a, b) => a - b);
+}
+
 var ordering = true;
 if (typeof dt.ordering !== "undefined" && dt.ordering === false) {
   ordering = dt.ordering;
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 4365ff6594..63ee1c468c 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -2839,7 +2839,7 @@ try {
                     'extra_html'                     => $active_filters_div.$graph_div,
                     'pagination_options'             => [
                         [
-                            $config['block_size'],
+                            (int) $config['block_size'],
                             10,
                             25,
                             100,
@@ -2847,7 +2847,7 @@ try {
                             500,
                         ],
                         [
-                            $config['block_size'],
+                            (int) $config['block_size'],
                             10,
                             25,
                             100,
@@ -2855,6 +2855,7 @@ try {
                             500,
                         ],
                     ],
+                    'pagination_options_order'       => 'true',
                     'order'                          => [
                         'field'     => 'timestamp',
                         'direction' => 'desc',