tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-11139-icono-de-lupa-descolocado-en-alert-details' into 'develop' 

Ent 11139 icono de lupa descolocado en alert details

See merge request artica/pandorafms!5877
This commit is contained in:
Matias Didier 2023-06-27 08:37:39 +00:00
parent 6b9145eeca 4b5cce3343
commit 43e158011a
2 changed files with 52 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pandora_console/include/ajax/alert_list.ajax.php
View File

@ -949,22 +949,22 @@ if ($get_agent_alerts_datatable === true) {
$tmp->force = $row[2];
$tmp->agent_name = $row[3];
$tmp->agent_module_name = $row[4];
$tmp->template_name = $row[5];
$tmp->action = $row[6];
$tmp->last_fired = $row[7];
$tmp->status = $row[8];
$tmp->validate = $row[9];
$tmp->template_name = $row[5].$row[6];
$tmp->action = $row[7];
$tmp->last_fired = $row[8];
$tmp->status = $row[9];
$tmp->validate = $row[10];
} else {
// Open.
$tmp->standby = $row[0];
$tmp->force = $row[1];
$tmp->agent_name = $row[2];
$tmp->agent_module_name = $row[3];
$tmp->template_name = $row[4];
$tmp->action = $row[5];
$tmp->last_fired = $row[6];
$tmp->status = $row[7];
$tmp->validate = $row[8];
$tmp->template_name = $row[4].$row[5];
$tmp->action = $row[6];
$tmp->last_fired = $row[7];
$tmp->status = $row[8];
$tmp->validate = $row[9];
}
$carry[] = $tmp;

76
pandora_console/include/functions_ui.php
View File

@ -1143,11 +1143,11 @@ function ui_format_alert_row(
'agent_name' => 3,
'module_name' => 4,
'description' => 5,
'template' => 5,
'action' => 6,
'last_fired' => 7,
'status' => 8,
'validate' => 9,
'template' => 6,
'action' => 7,
'last_fired' => 8,
'status' => 9,
'validate' => 10,
];
} else {
$index = [
@ -1155,13 +1155,13 @@ function ui_format_alert_row(
'standby' => 1,
'force_execution' => 2,
'agent_name' => 3,
'module_name' => 3,
'description' => 4,
'template' => 4,
'action' => 5,
'last_fired' => 6,
'status' => 7,
'validate' => 8,
'module_name' => 4,
'description' => 5,
'template' => 6,
'action' => 7,
'last_fired' => 8,
'status' => 9,
'validate' => 10,
];
}
} else {
@ -1172,24 +1172,24 @@ function ui_format_alert_row(
'agent_name' => 2,
'module_name' => 3,
'description' => 4,
'template' => 4,
'action' => 5,
'last_fired' => 6,
'status' => 7,
'validate' => 8,
'template' => 5,
'action' => 6,
'last_fired' => 7,
'status' => 8,
'validate' => 9,
];
} else {
$index = [
'standby' => 0,
'force_execution' => 1,
'agent_name' => 2,
'module_name' => 2,
'description' => 3,
'template' => 3,
'action' => 4,
'last_fired' => 5,
'status' => 6,
'validate' => 7,
'module_name' => 3,
'description' => 4,
'template' => 5,
'action' => 6,
'last_fired' => 7,
'status' => 8,
'validate' => 9,
];
}
}
@ -1322,7 +1322,7 @@ function ui_format_alert_row(
$additionUrl = '';
}
$forceExecButtons[] = html_print_anchor(
$forceExecButtons['force_check'] = html_print_anchor(
[
'href' => $url.'&id_alert='.$alert['id'].'&refr=60'.$additionUrl,
'content' => html_print_image(
@ -1338,9 +1338,10 @@ function ui_format_alert_row(
);
}
$forceExecButtons[] = html_print_anchor(
$forceExecButtons['template'] = html_print_anchor(
[
'href' => 'ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template='.$template['id'],
'style' => 'margin-left: 5px;',
'class' => 'template_details',
'content' => html_print_image(
'images/details.svg',
@ -1351,9 +1352,10 @@ function ui_format_alert_row(
true
);
} else {
$forceExecButtons[] = html_print_anchor(
$forceExecButtons['template'] = html_print_anchor(
[
'href' => ui_get_full_url('/', false, false, false).'/ajax.php?page=enterprise/meta/include/ajax/tree_view.ajax&action=get_template_tooltip&id_template='.$template['id'].'&server_name='.$alert['server_data']['server_name'],
'style' => 'margin-left: 5px;',
'class' => 'template_details',
'content' => html_print_image(
'images/details.svg',
@ -1365,13 +1367,19 @@ function ui_format_alert_row(
);
}
$data[$index['force_execution']] = html_print_div(
[
'class' => 'table_action_buttons flex',
'content' => implode('', $forceExecButtons),
],
true
);
if (isset($forceExecButtons['force_check'])) {
$data[$index['force_execution']] = html_print_div(
[
'class' => 'table_action_buttons flex',
'content' => $forceExecButtons['force_check'],
],
true
);
}
if (isset($forceExecButtons['template'])) {
$data[$index['template']] = $forceExecButtons['template'];
}
$data[$index['agent_name']] = $disabledHtmlStart;
if ($agent == 0) {