Merge branch 'ent-11431-problemas-con-permisos-para-ver-alertas' into 'develop'

Ent 11431 problemas con permisos para ver alertas

See merge request artica/pandorafms!6016
This commit is contained in:
Rafael Ameijeiras 2023-06-01 14:05:16 +00:00
commit 6518f81cfe
2 changed files with 20 additions and 23 deletions

View File

@ -259,7 +259,6 @@ if ($access_console_node === true) {
if ((bool) check_acl($config['id_user'], 0, 'LW') === true if ((bool) check_acl($config['id_user'], 0, 'LW') === true
|| (bool) check_acl($config['id_user'], 0, 'LM') === true || (bool) check_acl($config['id_user'], 0, 'LM') === true
|| (bool) check_acl($config['id_user'], 0, 'AD') === true
) { ) {
$menu_godmode['galertas']['text'] = __('Alerts'); $menu_godmode['galertas']['text'] = __('Alerts');
$menu_godmode['galertas']['sec2'] = 'godmode/alerts/alert_list'; $menu_godmode['galertas']['sec2'] = 'godmode/alerts/alert_list';

View File

@ -271,29 +271,27 @@ if ((bool) check_acl($config['id_user'], $id_group, 'LW') === true || (bool) che
} }
} }
if ((bool) check_acl($config['id_user'], $id_group, 'AW') === true || (bool) check_acl($config['id_user'], $id_group, 'LM') === true) { array_push(
array_push( $column_names,
$column_names, ['text' => 'Module'],
['text' => 'Module'], ['text' => 'Template'],
['text' => 'Template'], [
[ 'title' => __('Action'),
'title' => __('Action'), 'text' => __('Action'),
'text' => __('Action'), 'style' => 'min-width: 15%;',
'style' => 'min-width: 15%;', ],
], ['text' => 'Last fired'],
['text' => 'Last fired'], ['text' => 'Status']
['text' => 'Status'] );
);
$columns = array_merge( $columns = array_merge(
$columns, $columns,
['agent_module_name'], ['agent_module_name'],
['template_name'], ['template_name'],
['action'], ['action'],
['last_fired'], ['last_fired'],
['status'] ['status']
); );
}
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) {