tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-25 19:09:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

10408

Browse Source
This commit is contained in:
Pablo Aragon 2023-03-24 12:29:03 +01:00
parent 0fa79e44f1
commit 95edb47d01
2 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/include/javascript/jquery.pandora.controls.js
View File

@ -269,6 +269,7 @@
$(this).change(function() { $(this).change(function() {
var id_os = this.value; var id_os = this.value;
$("select#id_os").select2("close");
var home_url; var home_url;
if (typeof settings == "undefined") home_url = "./"; if (typeof settings == "undefined") home_url = "./";

42
pandora_console/operation/agentes/alerts_status.php
View File

@ -230,10 +230,15 @@ if ((bool) check_acl($config['id_user'], $id_group, 'LW') === true || (bool) che
'title' => __('Standby'), 'title' => __('Standby'),
'text' => __('Standby'), 'text' => __('Standby'),
], ],
[
'title' => __('Operations'),
'text' => __('Operations'),
],
); );
$columns = array_merge( $columns = array_merge(
['standby'], ['standby'],
['force'],
$columns $columns
); );
@ -270,7 +275,11 @@ if ((bool) check_acl($config['id_user'], $id_group, 'AW') === true || (bool) che
$column_names, $column_names,
['text' => 'Module'], ['text' => 'Module'],
['text' => 'Template'], ['text' => 'Template'],
['text' => 'Operation'], [
'title' => __('Actions'),
'text' => __('Actions'),
'style' => 'min-width: 15%;',
],
['text' => 'Last fired'], ['text' => 'Last fired'],
['text' => 'Status'] ['text' => 'Status']
); );
@ -279,25 +288,12 @@ if ((bool) check_acl($config['id_user'], $id_group, 'AW') === true || (bool) che
$columns, $columns,
['agent_module_name'], ['agent_module_name'],
['template_name'], ['template_name'],
['operation'], ['actions'],
['last_fired'], ['last_fired'],
['status'] ['status']
); );
} }
if ($print_agent === true) {
array_push(
$column_names,
['text' => 'Agent']
);
$columns = array_merge(
$columns,
['agent_name']
);
}
if (is_metaconsole() === false) { if (is_metaconsole() === false) {
if ((bool) check_acl($config['id_user'], $id_group, 'LW') === true || (bool) check_acl($config['id_user'], $id_group, 'LM') === true) { if ((bool) check_acl($config['id_user'], $id_group, 'LW') === true || (bool) check_acl($config['id_user'], $id_group, 'LM') === true) {
array_unshift( array_unshift(
@ -315,22 +311,6 @@ if (is_metaconsole() === false) {
$columns $columns
); );
} }
if ((bool) check_acl($config['id_user'], $id_group, 'AW') === true || (bool) check_acl($config['id_user'], $id_group, 'LM') === true) {
array_push(
$column_names,
[
'title' => __('Actions'),
'text' => __('Actions'),
'style' => 'min-width: 15%;',
]
);
$columns = array_merge(
$columns,
['actions']
);
}
} }
if (is_metaconsole() === true) { if (is_metaconsole() === true) {