More fixes to invoice view.

[timetracker.git] / reports.php

diff --git a/reports.php b/reports.php
index 390c85c..0028e99 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -37,7 +37,7 @@ import('ttFavReportHelper');
 import('ttClientHelper');
 
 // Access check.
-if (!ttAccessAllowed('view_own_reports')) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -45,7 +45,7 @@ if (!ttAccessAllowed('view_own_reports')) {
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->team_id);
+  $custom_fields = new CustomFields($user->group_id);
   $smarty->assign('custom_fields', $custom_fields);
 }
 
@@ -104,7 +104,7 @@ $form->addInput(array('type'=>'combobox',
   'datakeys'=>array('id','name'),
   'empty'=>array(''=>$i18n->get('dropdown.all'))));
 if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
-  $task_list = ttTeamHelper::getActiveTasks($user->team_id);
+  $task_list = ttTeamHelper::getActiveTasks($user->group_id);
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',
@@ -122,16 +122,6 @@ $form->addInput(array('type'=>'combobox',
   'data'=>$include_options,
   'empty'=>array(''=>$i18n->get('dropdown.all'))));
 
-if ($user->canManageTeam() && $user->isPluginEnabled('ps')) {
-  $form->addInput(array('type'=>'combobox',
-   'name'=>'paid_status',
-   'style'=>'width: 250px;',
-   'data'=>array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid')),
-   'empty'=>array(''=>$i18n->get('dropdown.all'))
- ));
-}
-
-
 // Add invoiced / not invoiced selector.
 $invoice_options = array('1'=>$i18n->get('form.reports.include_invoiced'),
   '2'=>$i18n->get('form.reports.include_not_invoiced'));
@@ -141,11 +131,27 @@ $form->addInput(array('type'=>'combobox',
   'data'=>$invoice_options,
   'empty'=>array(''=>$i18n->get('dropdown.all'))));
 
+if ($user->canManageTeam() && $user->isPluginEnabled('ps')) {
+  $form->addInput(array('type'=>'combobox',
+   'name'=>'paid_status',
+   'style'=>'width: 250px;',
+   'data'=>array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid')),
+   'empty'=>array(''=>$i18n->get('dropdown.all'))
+ ));
+}
+
 $user_list = array();
-if ($user->canManageTeam() || $user->isClient()) {
+if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
   // Prepare user and assigned projects arrays.
-  if ($user->canManageTeam())
-    $users = ttTeamHelper::getUsers(); // Active and inactive users for managers.
+  if ($user->can('view_reports') || $user->can('view_all_reports')) {
+    $max_rank = $user->rank-1;
+    if ($user->can('view_all_reports')) $max_rank = 512;
+    if ($user->can('view_own_reports'))
+      $options = array('max_rank'=>$max_rank,'include_self'=>true);
+    else
+      $options = array('max_rank'=>$max_rank);
+    $users = $user->getUsers($options); // Active and inactive users.
+  }
   elseif ($user->isClient())
     $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.