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> 

* 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
This commit is contained in:
zarzuelo 2013-07-17 08:15:22 +00:00
parent 89a01dd446
commit 8ba81a432b
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-07-17 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/planned_downtime.editor.php
godmode/menu.php: Fix a planned downtime ACLS problem
for bug #2305
2013-07-16 Ramon Novoa <rnovoa@artica.es> 2013-07-16 Ramon Novoa <rnovoa@artica.es>
* include/functions_snmp_browser.php: Use version 2c by default. Some * include/functions_snmp_browser.php: Use version 2c by default. Some

6
pandora_console/godmode/agentes/planned_downtime.editor.php
View File

@ -309,7 +309,7 @@ $table->data = array ();
$table->data[0][0] = __('Name'); $table->data[0][0] = __('Name');
$table->data[0][1] = html_print_input_text ('name', $name, '', 25, 40, true); $table->data[0][1] = html_print_input_text ('name', $name, '', 25, 40, true);
$table->data[1][0] = __('Group'); $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][0] = __('Description');
$table->data[2][1] = html_print_textarea ('description', 3, 35, $description, '', true); $table->data[2][1] = html_print_textarea ('description', 3, 35, $description, '', true);
@ -476,7 +476,7 @@ if ($id_downtime > 0) {
$data = array (); $data = array ();
if ($downtimes) { if ($downtimes) {
foreach ($downtimes as $downtime) { 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']; $data[$downtime['id_agente']] = $downtime['nombre'];
} }
} }
@ -489,7 +489,7 @@ if ($id_downtime > 0) {
echo "<form method=post action='index.php?sec=gagente&sec2=godmode/agentes/planned_downtime.editor&id_downtime=$id_downtime'>"; echo "<form method=post action='index.php?sec=gagente&sec2=godmode/agentes/planned_downtime.editor&id_downtime=$id_downtime'>";
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 "<br /><br />"; echo "<br /><br />";
html_print_submit_button (__('Filter by group'), '', false, 'class="sub next"',false); html_print_submit_button (__('Filter by group'), '', false, 'class="sub next"',false);

7
pandora_console/godmode/menu.php
View File

@ -37,12 +37,11 @@ if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0,
enterprise_hook("duplicate_confi_submenu"); 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")) { if (check_acl ($config["id_user"], 0, "PM")) {
$sub["godmode/groups/modu_group_list"]["text"] = __('Module groups'); $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'); $sub["godmode/agentes/fields_manager"]["text"] = __('Manage custom fields');
} }
enterprise_hook('agents_submenu'); enterprise_hook('agents_submenu');