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

2013-02-25 Sergio Martin <sergio.martin@artica.es>

Browse Source 
* include/functions_reports.php
	godmode/reporting/reporting_builder.php: Fixed some interface errors on
	reports views and other ACLs fixes



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7711 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-02-25 11:57:34 +00:00
parent 24e1fe692e
commit 83fb4e3e14
3 changed files with 22 additions and 12 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-02-25 Sergio Martin <sergio.martin@artica.es>
* include/functions_reports.php
godmode/reporting/reporting_builder.php: Fixed some interface errors on
reports views and other ACLs fixes
2013-02-25 Miguel de Dios <miguel.dedios@artica.es> 2013-02-25 Miguel de Dios <miguel.dedios@artica.es>
* godmode/modules/manage_network_components_form_common.php, * godmode/modules/manage_network_components_form_common.php,

26
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -365,7 +365,7 @@ switch ($action) {
$next = 6; $next = 6;
} }
//Admin options only for IW flag //Admin options only for RM flag
if (check_acl ($config['id_user'], 0, "RM")) { if (check_acl ($config['id_user'], 0, "RM")) {
$table->head[$next] = __('Private'); $table->head[$next] = __('Private');
@ -416,16 +416,20 @@ switch ($action) {
} }
if ($report["private"] == 1) //Admin options only for RM flag
$data[$next] = __('Yes'); if (check_acl ($config['id_user'], 0, "RM")) {
else
$data[$next] = __('No'); if ($report["private"] == 1)
$data[$next] = __('Yes');
$next++; else
$data[$next] = __('No');
$data[$next] = ui_print_group_icon($report['id_group'], true, "groups_small", '', !defined('METACONSOLE')); $next++;
$next++;
$data[$next] = ui_print_group_icon($report['id_group'], true, "groups_small", '', !defined('METACONSOLE'));
$next++;
}
$type_access_selected = reports_get_type_access($report); $type_access_selected = reports_get_type_access($report);
$edit = false; $edit = false;

2
pandora_console/include/functions_reports.php
View File

@ -118,7 +118,7 @@ function reports_get_reports ($filter = false, $fields = false, $returnAllGroup
if (!in_array($report['id_group'], array_keys($groups))) if (!in_array($report['id_group'], array_keys($groups)))
continue; continue;
if ($config['id_user'] != $report['id_user'] if ($config['id_user'] != $report['id_user']
&& ! check_acl ($config['id_user'], $report['id_group'], 'RR')) && ! check_acl ($config['id_user'], $report['id_group'], $privileges))
continue; continue;
} }
array_push ($reports, $report); array_push ($reports, $report);