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-13603-perfil-aw-muestra-mal-las-opciones-del-welcome-dialog' into 'develop' 

Ent 13603 Perfil AW muestra mal las opciones del Welcome Dialog

See merge request artica/pandorafms!7340
This commit is contained in:
Matias Didier 2024-05-09 09:21:19 +00:00
parent 5a8acb9622 5af63c9644
commit efe05e41d7
3 changed files with 54 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/include/ajax/task_to_perform.php
View File

@ -145,6 +145,11 @@ if ($create_net_scan) {
}
if ($create_mail_alert) {
if ((bool) check_acl($config['id_user'], 0, 'LM') === false) {
ui_print_error_message(__('Unauthorized'));
return;
}
include_once '../functions_alerts.php';
$id_action = db_get_row_filter('talert_actions', ['name' => 'Email to '.$config['id_user']], 'id')['id'];
if (!$id_action) {

46
pandora_console/include/class/WelcomeWindow.class.php
View File

@ -378,6 +378,8 @@ class WelcomeWindow extends Wizard
'class' => 'modal',
];
$output = '';
if (check_acl($config['id_user'], 0, 'PM')) {
$flag_um = false;
$flag_cm = false;
@ -590,6 +592,18 @@ class WelcomeWindow extends Wizard
if ($flag_um === false || $flag_cm === false || $flag_su === false || $flag_lv === false) {
$flag_task = true;
}
} else {
$output .= html_print_div(
[
'class' => 'flex-column-start welcome-message-no-pm',
'content' => '
<h2>'.__('Hi!').'</h2>
<p class="mrgn_btn_5px">'.__('It seems you are new to Pandora FMS.').'<br />
'.__('If you want to watch videos on how to use Pandora FMS, you can visit our ').'<a href="https://www.youtube.com/@PandoraFMS" target="_blank"><b>'.__('YouTube channel.').'</b></a></p>
<p class="mrgn_top_5px">'.__('Are you familiar with ').'<a href="https://pandorafms.com/es/producto/elearning/" target="_blank"><b>'.__('our eLearning system?').'</b></a>'.__(' It\'s completely free for PAO (Operation) and PAT (Administration) courses. Learn how to use Pandora FMS at your own pace.').'</p>',
],
true
);
}
// Task to do.
@ -610,12 +624,20 @@ class WelcomeWindow extends Wizard
],
];
$fields['load_demo_data'] = __('Load demo data');
$fields['wizard_agent'] = __('Agent installation wizard');
$fields['check_web'] = __('Create WEB monitoring');
$fields['check_connectivity'] = __('Create network monitoring');
$fields['check_net'] = __('Discover my network');
$fields['check_mail_alert'] = __('Create email alert');
if (users_is_admin() === true) {
$fields['load_demo_data'] = __('Load demo data');
}
if ((bool) check_acl($config['id_user'], 0, 'AW') === true) {
$fields['wizard_agent'] = __('Agent installation wizard');
$fields['check_web'] = __('Create WEB monitoring');
$fields['check_connectivity'] = __('Create network monitoring');
$fields['check_net'] = __('Discover my network');
}
if ((bool) check_acl($config['id_user'], 0, 'LM') === true) {
$fields['check_mail_alert'] = __('Create email alert');
}
$inputs[] = [
'wrapper' => 'div',
@ -649,10 +671,16 @@ class WelcomeWindow extends Wizard
],
];
$output = $this->printForm(
$output = html_print_div(
[
'form' => $form,
'inputs' => $inputs,
'content' => $output.$this->printForm(
[
'form' => $form,
'inputs' => $inputs,
],
true
),
'class' => 'column-left w50p',
],
true
);

12
pandora_console/include/styles/pandora.css
View File

@ -14319,3 +14319,15 @@ div.fixed-bottom-box.tree-view-bottom-modal {
.discovery-list-extensions tbody tr td {
height: 30px;
}
.welcome-message-no-pm h2 {
font-size: 20px !important;
margin: 0px;
}
.welcome-message-no-pm p,
.welcome-message-no-pm b {
font-size: 15px !important;
}
.welcome-message-no-pm {
margin-bottom: 30px;
}