X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=tasks.php;h=7b5f997906f5d61aa546959499324c7ba34b389f;hb=cdd2e058776a3d0dc9b6f32a2d5d33e4f9388491;hp=2d310d0114e219b20c0f460910b24c353b068648;hpb=11bfec0ff88b649a934556e8b4812d65715c7509;p=timetracker.git diff --git a/tasks.php b/tasks.php index 2d310d01..7b5f9979 100644 --- a/tasks.php +++ b/tasks.php @@ -28,21 +28,27 @@ require_once('initialize.php'); import('form.Form'); -import('ttTeamHelper'); +import('ttGroupHelper'); // Access checks. -if (!ttAccessAllowed('manage_tasks')) { +if (!(ttAccessAllowed('view_own_tasks') || ttAccessAllowed('manage_tasks'))) { header('Location: access_denied.php'); exit(); } -if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) { +if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) { header('Location: feature_disabled.php'); exit(); } // End of access checks. -$smarty->assign('active_tasks', ttTeamHelper::getActiveTasks($user->team_id)); -$smarty->assign('inactive_tasks', ttTeamHelper::getInactiveTasks($user->team_id)); +if($user->can('manage_tasks')) { + $active_tasks = ttGroupHelper::getActiveTasks(); + $inactive_tasks = ttGroupHelper::getInactiveTasks(); +} else + $active_tasks = $user->getAssignedTasks(); + +$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');