tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

11821-Events not sort by comments

Browse Source
This commit is contained in:
Pablo Aragon 2023-08-24 14:43:05 +02:00
parent 8346156579
commit 9271dc33f1
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/include/functions_ui.php
View File

@ -3913,6 +3913,15 @@ function ui_print_datatable(array $parameters)
$parameters['toggle_collapsed'] = true; $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'])) { if (!is_array($parameters['order'])) {
$order = 0; $order = 0;
$direction = 'asc'; $direction = 'asc';
@ -3926,7 +3935,7 @@ function ui_print_datatable(array $parameters)
} else { } else {
$order = array_search( $order = array_search(
$parameters['order']['field'], $parameters['order']['field'],
$parameters['columns'] $columns_tmp
); );
if ($order === false) { if ($order === false) {
@ -3943,7 +3952,7 @@ function ui_print_datatable(array $parameters)
foreach ($parameters['no_sortable_columns'] as $key => $find) { foreach ($parameters['no_sortable_columns'] as $key => $find) {
$found = array_search( $found = array_search(
$parameters['no_sortable_columns'][$key], $parameters['no_sortable_columns'][$key],
$parameters['columns'] $columns_tmp
); );
if ($found !== false) { if ($found !== false) {

1
pandora_console/operation/events/events.php
View File

@ -2728,6 +2728,7 @@ try {
-1, -1,
-2, -2,
'column-instructions', 'column-instructions',
'user_comment',
], ],
'ajax_return_operation' => 'buffers', 'ajax_return_operation' => 'buffers',
'ajax_return_operation_function' => 'process_buffers', 'ajax_return_operation_function' => 'process_buffers',