More refactoring for subgroups.

[timetracker.git] / project_edit.php

diff --git a/project_edit.php b/project_edit.php
index 20376325154289f35ef9e890dc0056b0f8cad484..7f48c910ce3159e6196266bc67df3d921e9624bc 100644 (file)
--- a/project_edit.php
+++ b/project_edit.php
@@ -29,14 +29,14 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttProjectHelper');
-import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!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,11 +48,11 @@ if (!$project) {
 }
 // End of access checks.
 
-$users = ttTeamHelper::getActiveUsers();
+$users = ttGroupHelper::getActiveUsers();
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
-$tasks = ttTeamHelper::getActiveTasks($user->getActiveGroup());
+$tasks = ttGroupHelper::getActiveTasks();
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
 
@@ -85,7 +85,7 @@ $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width:
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
   $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
@@ -118,7 +118,7 @@ if ($request->isPost()) {
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
         if (ttProjectHelper::insert(array(
-          'group_id' => $user->getActiveGroup(),
+          'group_id' => $user->getGroup(),
           'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
@@ -136,6 +136,8 @@ if ($request->isPost()) {
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_users', count($users) > 0);
+$smarty->assign('show_tasks', count($tasks) > 0);
 $smarty->assign('onload', 'onLoad="document.projectForm.name.focus()"');
 $smarty->assign('title', $i18n->get('title.edit_project'));
 $smarty->assign('content_page_name', 'project_edit.tpl');