X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=tasks.php;h=7b5f997906f5d61aa546959499324c7ba34b389f;hb=5629a1c360655d5a09dc965004946bf65e3725b9;hp=3ea2faaa0fb6dec831e03a7af2bd32f9aa013801;hpb=3ad790a3d4bc23cb23f7ee072171ca6ef987eb56;p=timetracker.git

diff --git a/tasks.php b/tasks.php
index 3ea2faaa..7b5f9979 100644
--- a/tasks.php
+++ b/tasks.php
@@ -28,16 +28,27 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
+import('ttGroupHelper');
 
-// Access check.
-if (!ttAccessCheck(right_manage_team) || MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+// Access checks.
+if (!(ttAccessAllowed('view_own_tasks') || ttAccessAllowed('manage_tasks'))) {
   header('Location: access_denied.php');
   exit();
 }
+if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.
+
+if($user->can('manage_tasks')) {
+  $active_tasks = ttGroupHelper::getActiveTasks();
+  $inactive_tasks = ttGroupHelper::getInactiveTasks();
+} else
+  $active_tasks = $user->getAssignedTasks();
 
-$smarty->assign('active_tasks', ttTeamHelper::getActiveTasks($user->team_id));
-$smarty->assign('inactive_tasks', ttTeamHelper::getInactiveTasks($user->team_id));
-$smarty->assign('title', $i18n->getKey('title.tasks'));
+$smarty->assign('active_tasks', $active_tasks);
+$smarty->assign('inactive_tasks', $inactive_tasks);
+$smarty->assign('title', $i18n->get('title.tasks'));
 $smarty->assign('content_page_name', 'tasks.tpl');
 $smarty->display('index.tpl');