From 8ba81a432b868e4e5cde264c35d07d4c22af4e22 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Wed, 17 Jul 2013 08:15:22 +0000 Subject: [PATCH] 2013-07-17 Sergio Martin * godmode/agentes/planned_downtime.editor.php godmode/menu.php: Fix a planned downtime ACLS problem for bug #2305 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8533 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ .../godmode/agentes/planned_downtime.editor.php | 6 +++--- pandora_console/godmode/menu.php | 7 +++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index e466d74e1e..446f81350c 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2013-07-17 Sergio Martin + + * godmode/agentes/planned_downtime.editor.php + godmode/menu.php: Fix a planned downtime ACLS problem + for bug #2305 + 2013-07-16 Ramon Novoa * include/functions_snmp_browser.php: Use version 2c by default. Some diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php index 3a8bbf6853..a3ddec9555 100755 --- a/pandora_console/godmode/agentes/planned_downtime.editor.php +++ b/pandora_console/godmode/agentes/planned_downtime.editor.php @@ -309,7 +309,7 @@ $table->data = array (); $table->data[0][0] = __('Name'); $table->data[0][1] = html_print_input_text ('name', $name, '', 25, 40, true); $table->data[1][0] = __('Group'); -$table->data[1][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group, '', '', 0, true); +$table->data[1][1] = html_print_select_groups(false, "AW", true, 'id_group', $id_group, '', '', 0, true); $table->data[2][0] = __('Description'); $table->data[2][1] = html_print_textarea ('description', 3, 35, $description, '', true); @@ -476,7 +476,7 @@ if ($id_downtime > 0) { $data = array (); if ($downtimes) { foreach ($downtimes as $downtime) { - if (check_acl ($config["id_user"], $downtime['id_grupo'], "AR")) { + if (check_acl ($config["id_user"], $downtime['id_grupo'], "AW")) { $data[$downtime['id_agente']] = $downtime['nombre']; } } @@ -489,7 +489,7 @@ if ($id_downtime > 0) { echo "
"; - html_print_select_groups(false, "AR", true, 'filter_group', $filter_group, '', '', '', false, false, true, '', false, 'width:180px'); + html_print_select_groups(false, "AW", true, 'filter_group', $filter_group, '', '', '', false, false, true, '', false, 'width:180px'); echo "

"; html_print_submit_button (__('Filter by group'), '', false, 'class="sub next"',false); diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 9dc57346b9..7298d205a7 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -37,12 +37,11 @@ if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, enterprise_hook("duplicate_confi_submenu"); - if (check_acl ($config["id_user"], 0, "AW")) { - $sub["godmode/groups/group_list"]["text"] = __('Manage groups'); - } + $sub["godmode/groups/group_list"]["text"] = __('Manage groups'); + $sub["godmode/agentes/planned_downtime.list"]["text"] = __('Scheduled downtime'); + if (check_acl ($config["id_user"], 0, "PM")) { $sub["godmode/groups/modu_group_list"]["text"] = __('Module groups'); - $sub["godmode/agentes/planned_downtime.list"]["text"] = __('Scheduled downtime'); $sub["godmode/agentes/fields_manager"]["text"] = __('Manage custom fields'); } enterprise_hook('agents_submenu');