diff --git a/pandora_console/include/javascript/datatablesFunction.js b/pandora_console/include/javascript/datatablesFunction.js index b517830ce9..dae44dd6b1 100644 --- a/pandora_console/include/javascript/datatablesFunction.js +++ b/pandora_console/include/javascript/datatablesFunction.js @@ -1,3 +1,5 @@ +/* global $ */ + var dt = dt; var config = config; @@ -141,6 +143,8 @@ if (dt.no_move_elements_to_action === true) { noMoveElementsToAction = true; } +var showAlwaysPagination = false; + $(document).ready(function() { function checkPages() { if (dt_table.page.info().pages > 1) { @@ -253,7 +257,11 @@ $(document).ready(function() { $("div.pagination-child-div").hide(); $("div.dataTables_info").hide(); $(`#${dt.id}_wrapper`).hide(); - $(`.action_buttons_right_content .pagination-child-div`).hide(); + if (showAlwaysPagination) { + $(`.action_buttons_right_content .pagination-child-div`).show(); + } else { + $(`.action_buttons_right_content .pagination-child-div`).hide(); + } } else { $(`.datatable-msg-info-${dt.id}`).hide(); $(`table#${dt.id}`).show(); @@ -283,6 +291,12 @@ $(document).ready(function() { $(`#${dt.form_id}_loading`).remove(); } + if (json.showAlwaysPagination) { + showAlwaysPagination = true; + } else { + showAlwaysPagination = false; + } + if (json.error) { console.error(json.error); $(`#error-${dt.id}`).html(json.error); diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index c9962483f5..1086b8f908 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -1229,26 +1229,28 @@ if (is_ajax() === true) { } } - $no_return = false; + $regex_validation = false; if (empty($tmp) === false && $regex !== '') { - $regex_validation = false; foreach (json_decode(json_encode($tmp), true) as $key => $field) { + if ($key === 'b64') { + continue; + } + + $field = strip_tags($field); + if (preg_match('/'.$regex.'/', $field)) { $regex_validation = true; } } - if ($regex_validation === false) { - $no_return = true; + if ($regex_validation === true) { + $carry[] = $tmp; } + } else { + $carry[] = $tmp; } - if ($no_return === false) { - $carry[] = $tmp; - return $carry; - } else { - return; - } + return $carry; } ); } @@ -1256,10 +1258,11 @@ if (is_ajax() === true) { // RecordsTotal && recordsfiltered resultados totales. echo json_encode( [ - 'data' => ($data ?? []), - 'buffers' => $buffers, - 'recordsTotal' => $count, - 'recordsFiltered' => $count, + 'data' => ($data ?? []), + 'buffers' => $buffers, + 'recordsTotal' => $count, + 'recordsFiltered' => $count, + 'showAlwaysPagination' => (empty($regex) === false) ? true : false, ] ); } catch (Exception $e) {