X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=tasks.php;h=7b5f997906f5d61aa546959499324c7ba34b389f;hb=HEAD;hp=6c79fd50d1b38a46a7f4c29dd5ce3be9a0f80fd2;hpb=3cd4cdb1567b3b71fec7a980a3c1a432eb3a41a2;p=timetracker.git

diff --git a/tasks.php b/tasks.php
index 6c79fd50..7b5f9979 100644
--- a/tasks.php
+++ b/tasks.php
@@ -28,7 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('view_own_tasks') || ttAccessAllowed('manage_tasks'))) {
@@ -39,46 +39,14 @@ if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
-if ($request->isPost() && !$user->isGroupValid($request->getParameter('group'))) {
-  header('Location: access_denied.php'); // Wrong group id in post.
-  exit();
-}
 // End of access checks.
 
-if ($request->isPost()) {
-  $group_id = $request->getParameter('group');
-  $user->setOnBehalfGroup($group_id);
-  // Tasks feature may not be available in new group, check and redirect.
-  if (MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
-    header('Location: feature_disabled.php');
-    exit();
-  }
-} else {
-  $group_id = $user->getGroup();
-}
-
-$form = new Form('tasksForm');
-if ($user->can('manage_subgroups')) {
-  $groups = $user->getGroupsForDropdown();
-  if (count($groups) > 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'this.form.submit();',
-      'name'=>'group',
-      'style'=>'width: 250px;',
-      'value'=>$group_id,
-      'data'=>$groups,
-      'datakeys'=>array('id','name')));
-    $smarty->assign('group_dropdown', 1);
-  }
-}
-
 if($user->can('manage_tasks')) {
-  $active_tasks = ttTeamHelper::getActiveTasks($group_id);
-  $inactive_tasks = ttTeamHelper::getInactiveTasks($group_id);
+  $active_tasks = ttGroupHelper::getActiveTasks();
+  $inactive_tasks = ttGroupHelper::getInactiveTasks();
 } else
   $active_tasks = $user->getAssignedTasks();
 
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('active_tasks', $active_tasks);
 $smarty->assign('inactive_tasks', $inactive_tasks);
 $smarty->assign('title', $i18n->get('title.tasks'));