tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio

This commit is contained in:
daniel 2018-06-12 16:37:57 +02:00
parent dfc43a35ab d42d8a2fd7
commit 57503a2d3b
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/godmode/reporting/graph_builder.main.php
View File

@ -116,13 +116,12 @@ if ($edit_graph) {
echo ">"; echo ">";
$own_info = get_user_info ($config['id_user']); $own_info = get_user_info ($config['id_user']);
$return_all_groups = $own_info['is_admin'] || users_can_manage_group_all("RR");
echo "<td><b>".__('Group')."</b></td><td>"; echo "<td><b>".__('Group')."</b></td><td>";
if (check_acl ($config['id_user'], 0, "RW")) if (check_acl ($config['id_user'], 0, "RW"))
echo html_print_select_groups($config['id_user'], 'RW', $return_all_groups, 'graph_id_group', $id_group, '', '', '', true); echo html_print_select_groups($config['id_user'], 'RW', true, 'graph_id_group', $id_group, '', '', '', true);
elseif (check_acl ($config['id_user'], 0, "RM")) elseif (check_acl ($config['id_user'], 0, "RM"))
echo html_print_select_groups($config['id_user'], 'RM', $return_all_groups, 'graph_id_group', $id_group, '', '', '', true); echo html_print_select_groups($config['id_user'], 'RM', true, 'graph_id_group', $id_group, '', '', '', true);
echo "</td></tr>"; echo "</td></tr>";
echo "<tr>"; echo "<tr>";
echo "<td class='datos2'><b>".__('Description')."</b></td>"; echo "<td class='datos2'><b>".__('Description')."</b></td>";

5
pandora_console/godmode/reporting/graphs.php
View File

@ -32,7 +32,6 @@ if (!$report_r && !$report_w && !$report_m) {
} }
$access = ($report_r == true) ? 'RR' : (($report_w == true) ? 'RW' : (($report_m == true) ? 'RM' : 'RR')); $access = ($report_r == true) ? 'RR' : (($report_w == true) ? 'RW' : (($report_m == true) ? 'RM' : 'RR'));
$manage_group_all = users_can_manage_group_all($access);
$activeTab = get_parameter('tab', 'main'); $activeTab = get_parameter('tab', 'main');
@ -189,14 +188,14 @@ if (!empty ($graphs)) {
$data[3] = ui_print_group_icon($graph['id_group'],true); $data[3] = ui_print_group_icon($graph['id_group'],true);
$data[4] = ''; $data[4] = '';
if (($report_w || $report_m) && $manage_group_all) { if (($report_w || $report_m)) {
$data[4] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&edit_graph=1&id='. $data[4] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&edit_graph=1&id='.
$graph['id_graph'].'">'.html_print_image("images/config.png", true).'</a>'; $graph['id_graph'].'">'.html_print_image("images/config.png", true).'</a>';
} }
$data[4] .= '&nbsp;'; $data[4] .= '&nbsp;';
if ($report_m && $manage_group_all) { if ($report_m) {
$data[4] .= '<a href="index.php?sec=reporting&sec2=godmode/reporting/graphs&delete_graph=1&id=' $data[4] .= '<a href="index.php?sec=reporting&sec2=godmode/reporting/graphs&delete_graph=1&id='
.$graph['id_graph'].'" onClick="if (!confirm(\''.__('Are you sure?').'\')) .$graph['id_graph'].'" onClick="if (!confirm(\''.__('Are you sure?').'\'))
return false;">' . html_print_image("images/cross.png", true, array('alt' => __('Delete'), 'title' => __('Delete'))) . '</a>' . return false;">' . html_print_image("images/cross.png", true, array('alt' => __('Delete'), 'title' => __('Delete'))) . '</a>' .

2
pandora_console/godmode/reporting/reporting_builder.main.php
View File

@ -69,7 +69,7 @@ $table->data['name'][1] = html_print_input_text('name', $reportName,
$table->data['group'][0] = __('Group'); $table->data['group'][0] = __('Group');
$write_groups = users_get_groups_for_select(false, "RW", $write_groups = users_get_groups_for_select(false, "RW",
users_can_manage_group_all("RW"), true, false, 'id_grupo'); true, true, false, 'id_grupo');
// If the report group is not among the RW groups (special permission) we add it // If the report group is not among the RW groups (special permission) we add it
if (!isset($write_groups[$idGroupReport]) && $idGroupReport) { if (!isset($write_groups[$idGroupReport]) && $idGroupReport) {