Merge branch 'ent-12322-errores-en-los-menus-de-paginacion-de-operating-systems-y-alert-details' into 'develop'

Ent 12322 errores en los menus de paginacion de operating systems y alert details

See merge request artica/pandorafms!6642
This commit is contained in:
Rafael Ameijeiras 2023-11-10 08:49:54 +00:00
commit 72ebccd981
2 changed files with 23 additions and 10 deletions

View File

@ -97,6 +97,24 @@ try {
'column_names' => $column_names, 'column_names' => $column_names,
'ajax_url' => 'include/ajax/os', 'ajax_url' => 'include/ajax/os',
'ajax_data' => ['method' => 'drawOSTable'], 'ajax_data' => ['method' => 'drawOSTable'],
'pagination_options' => [
[
$config['block_size'],
10,
25,
100,
200,
500,
],
[
$config['block_size'],
10,
25,
100,
200,
500,
],
],
'ajax_postprocess' => 'process_datatables_item(item)', 'ajax_postprocess' => 'process_datatables_item(item)',
'no_sortable_columns' => [ 'no_sortable_columns' => [
-1, -1,
@ -137,6 +155,10 @@ if (is_metaconsole() === true) {
true true
); );
$buttons .= '</form>'; $buttons .= '</form>';
} else {
$buttons .= '<form method="post" action="index.php?sec=gagente&sec2=godmode/setup/os&tab=manage_os&action=edit">';
$buttons .= html_print_submit_button(__('Create OS'), 'update_button', false, ['icon' => 'next'], true);
$buttons .= '</form>';
} }
html_print_action_buttons( html_print_action_buttons(
@ -150,15 +172,6 @@ html_print_action_buttons(
echo '<div id="aux" class="invisible"></div>'; echo '<div id="aux" class="invisible"></div>';
echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/setup/os&tab=manage_os&action=edit">';
html_print_action_buttons(
html_print_submit_button(__('Create OS'), 'update_button', false, ['icon' => 'next'], true),
['type' => 'form_action']
);
echo '</form>';
?> ?>
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
function process_datatables_item(item) { function process_datatables_item(item) {

View File

@ -10328,7 +10328,7 @@ select:focus {
} }
.dataTables_length > label { .dataTables_length > label {
color: #fff; color: #000;
} }
input[type="button"], input[type="button"],