From 54eb30bddfe79e85e58d7b62f34a4448b386d7d5 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Wed, 17 Jul 2013 10:31:31 +0000 Subject: [PATCH] 2013-07-17 Sergio Martin * operation/agentes/status_monitor.php operation/agentes/alerts_status.php godmode/alerts/configure_alert_template.php: Clean useless ACL checks. Change header string by the same string but translated. Added to the alert templates wizard level combo the option No Wizard to avoid confussing git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8534 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 10 ++++++++++ .../godmode/alerts/configure_alert_template.php | 1 + pandora_console/operation/agentes/alerts_status.php | 2 +- pandora_console/operation/agentes/status_monitor.php | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 446f81350c..8ff277ce95 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2013-07-17 Sergio Martin + + * operation/agentes/status_monitor.php + operation/agentes/alerts_status.php + godmode/alerts/configure_alert_template.php: Clean + useless ACL checks. Change header string by the same + string but translated. Added to the alert templates + wizard level combo the option No Wizard to avoid + confussing + 2013-07-17 Sergio Martin * godmode/agentes/planned_downtime.editor.php diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php index e09d2c9cf9..3822d33a6c 100644 --- a/pandora_console/godmode/alerts/configure_alert_template.php +++ b/pandora_console/godmode/alerts/configure_alert_template.php @@ -644,6 +644,7 @@ else { if(defined('METACONSOLE')) { $table->data[3][0] = __('Wizard level'); $wizard_levels = array( + 'nowizard' => __('No wizard'), 'basic' => __('Basic'), 'advanced' => __('Advanced')); $table->data[3][1] = html_print_select($wizard_levels,'wizard_level',$wizard_level,'','',-1,true, false, false); diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index 1c98c2bcd9..635686b825 100644 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -465,7 +465,7 @@ if (!empty ($table->data)) { html_print_table ($table); if (!defined('METACONSOLE')) { - if (check_acl ($config["id_user"], $id_group, "AW") || check_acl ($config["id_user"], $id_group, "AM")) { + if (check_acl ($config["id_user"], $id_group, "AW")) { if (count($alerts['alerts_simple']) > 0) { echo '
'; html_print_submit_button (__('Validate'), 'alert_validate', false, 'class="sub ok"', false); diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 26f479d00e..b31eb10325 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -38,7 +38,7 @@ $isFunctionPolicies = enterprise_include_once ('include/functions_policies.php') if (! defined ('METACONSOLE')) { //Header - ui_print_page_header ("Monitor detail", "images/brick.png", false); + ui_print_page_header (__("Monitor detail"), "images/brick.png", false); } else {