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

2013-07-17 Sergio Martin <sergio.martin@artica.es> 

* 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
This commit is contained in:
zarzuelo 2013-07-17 10:31:31 +00:00
parent 8ba81a432b
commit 54eb30bddf
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2013-07-17 Sergio Martin <sergio.martin@artica.es>
* 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 <sergio.martin@artica.es>
* godmode/agentes/planned_downtime.editor.php

1
pandora_console/godmode/alerts/configure_alert_template.php
View File

@ -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);

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

@ -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 '<div class="action-buttons" style="width: '.$table->width.';">';
html_print_submit_button (__('Validate'), 'alert_validate', false, 'class="sub ok"', false);

2
pandora_console/operation/agentes/status_monitor.php
View File

@ -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 {