Refactored mobile expenses.php for subgroups.

[timetracker.git] / projects.php

diff --git a/projects.php b/projects.php
index 3845db6..8b4537e 100644 (file)
--- a/projects.php
+++ b/projects.php
@@ -29,13 +29,14 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!(ttAccessAllowed('view_own_projects') || ttAccessAllowed('manage_projects'))) {
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
   header('Location: feature_disabled.php');
   exit();
 }
@@ -48,8 +49,13 @@ if ($request->isPost() && !$user->isGroupValid($request->getParameter('group')))
 if ($request->isPost()) {
   $group_id = $request->getParameter('group');
   $user->setOnBehalfGroup($group_id);
+  // Projects feature may not be available in new group, check and redirect.
+  if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
+    header('Location: feature_disabled.php');
+    exit();
+  }
 } else {
-  $group_id = $user->getActiveGroup();
+  $group_id = $user->getGroup();
 }
 
 $form = new Form('projectsForm');
@@ -68,8 +74,8 @@ if ($user->can('manage_subgroups')) {
 }
 
 if($user->can('manage_projects')) {
-  $active_projects = ttTeamHelper::getActiveProjects($group_id);
-  $inactive_projects = ttTeamHelper::getInactiveProjects($group_id);
+  $active_projects = ttGroupHelper::getActiveProjects();
+  $inactive_projects = ttGroupHelper::getInactiveProjects();
 } else
   $active_projects = $user->getAssignedProjects();