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 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7711 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
parent
24e1fe692e
commit
83fb4e3e14
|
@ -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>
|
||||
|
||||
* godmode/modules/manage_network_components_form_common.php,
|
||||
|
|
|
@ -365,7 +365,7 @@ switch ($action) {
|
|||
$next = 6;
|
||||
}
|
||||
|
||||
//Admin options only for IW flag
|
||||
//Admin options only for RM flag
|
||||
if (check_acl ($config['id_user'], 0, "RM")) {
|
||||
|
||||
$table->head[$next] = __('Private');
|
||||
|
@ -416,16 +416,20 @@ switch ($action) {
|
|||
}
|
||||
|
||||
|
||||
if ($report["private"] == 1)
|
||||
$data[$next] = __('Yes');
|
||||
else
|
||||
$data[$next] = __('No');
|
||||
|
||||
$next++;
|
||||
|
||||
|
||||
$data[$next] = ui_print_group_icon($report['id_group'], true, "groups_small", '', !defined('METACONSOLE'));
|
||||
$next++;
|
||||
//Admin options only for RM flag
|
||||
if (check_acl ($config['id_user'], 0, "RM")) {
|
||||
|
||||
if ($report["private"] == 1)
|
||||
$data[$next] = __('Yes');
|
||||
else
|
||||
$data[$next] = __('No');
|
||||
|
||||
$next++;
|
||||
|
||||
|
||||
$data[$next] = ui_print_group_icon($report['id_group'], true, "groups_small", '', !defined('METACONSOLE'));
|
||||
$next++;
|
||||
}
|
||||
|
||||
$type_access_selected = reports_get_type_access($report);
|
||||
$edit = false;
|
||||
|
|
|
@ -118,7 +118,7 @@ function reports_get_reports ($filter = false, $fields = false, $returnAllGroup
|
|||
if (!in_array($report['id_group'], array_keys($groups)))
|
||||
continue;
|
||||
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;
|
||||
}
|
||||
array_push ($reports, $report);
|
||||
|
|
Loading…
Reference in New Issue