tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 00:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

2011-11-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

Browse Source 
* operation/menu.php: Fixed a wrong sec2 tag that makes enterprise 
	ACLs fail.
	
	Fixes: #3439464



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5162 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-11-24 12:51:00 +00:00
parent 8816d6a5d1
commit dfbfbdcbfd
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2011-11-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/menu.php: Fixed a wrong sec2 tag that makes enterprise
ACLs fail.
Fixes: #3439464
2011-11-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2011-11-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/agentes/networkmap.php * operation/agentes/networkmap.php

4
pandora_console/operation/menu.php
View File

@ -176,13 +176,14 @@ enterprise_hook ('inventory_menu');
//Incidents //Incidents
if (check_acl ($config['id_user'], 0, "IR") == 1) { if (check_acl ($config['id_user'], 0, "IR") == 1) {
$temp_sec2 = $sec2;
if($config['integria_enabled']) { if($config['integria_enabled']) {
$sec2 = "operation/integria_incidents/incident"; $sec2 = "operation/integria_incidents/incident";
} }
else { else {
$sec2 = "operation/incidents/incident"; $sec2 = "operation/incidents/incident";
} }
$menu["incidencias"]["text"] = __('Manage incidents'); $menu["incidencias"]["text"] = __('Manage incidents');
$menu["incidencias"]["sec2"] = $sec2; $menu["incidencias"]["sec2"] = $sec2;
$menu["incidencias"]["refr"] = 0; $menu["incidencias"]["refr"] = 0;
@ -192,6 +193,7 @@ if (check_acl ($config['id_user'], 0, "IR") == 1) {
$sub["operation/incidents/incident_statistics"]["text"] = __('Statistics'); $sub["operation/incidents/incident_statistics"]["text"] = __('Statistics');
$menu["incidencias"]["sub"] = $sub; $menu["incidencias"]["sub"] = $sub;
$sec2 = $temp_sec2;
} }
// Rest of options, all with AR privilege (or should events be with incidents?) // Rest of options, all with AR privilege (or should events be with incidents?)