X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=project_edit.php;h=e1792e48cc0b428912e739b8028c0a22218ff1db;hb=HEAD;hp=d30782ab540c1a0f4d81157f6d6790dcb43c28c7;hpb=030d2c3ffbf8229cc945427e9e9f7704226effe1;p=timetracker.git

diff --git a/project_edit.php b/project_edit.php
index d30782ab..e1792e48 100644
--- a/project_edit.php
+++ b/project_edit.php
@@ -29,27 +29,33 @@
 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();
 }
-
 $cl_project_id = (int)$request->getParameter('id');
+$project = ttProjectHelper::get($cl_project_id);
+if (!$project) {
+  header('Location: access_denied.php');
+  exit();
+}
+// 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->team_id);
+$tasks = ttGroupHelper::getActiveTasks();
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
+$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0;
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('project_name'));
@@ -58,19 +64,10 @@ if ($request->isPost()) {
   $cl_users = $request->getParameter('users', array());
   $cl_tasks = $request->getParameter('tasks', array());
 } else {
-  $project = ttProjectHelper::get($cl_project_id);
   $cl_name = $project['name'];
   $cl_description = $project['description'];
   $cl_status = $project['status'];
-
-  $mdb2 = getConnection();
-  $sql = "select user_id from tt_user_project_binds where status = 1 and project_id = $cl_project_id";
-  $res = $mdb2->query($sql);
-  if (is_a($res, 'PEAR_Error'))
-    die($res->getMessage());
-  while ($row = $res->fetchRow())
-    $cl_users[] = $row['user_id'];
-
+  $cl_users = ttProjectHelper::getAssignedUsers($cl_project_id);
   $cl_tasks = explode(',', $project['tasks']);
 }
 
@@ -81,7 +78,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 ($show_tasks)
   $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')));
@@ -90,32 +87,32 @@ if ($request->isPost()) {
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));
 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
       $existing_project = ttProjectHelper::getProjectByName($cl_name);
       if (!$existing_project || ($cl_project_id == $existing_project['id'])) {
-         // Update project information.
-         if (ttProjectHelper::update(array(
-           'id' => $cl_project_id,
-           'name' => $cl_name,
-           'description' => $cl_description,
-           'status' => $cl_status,
-           'users' => $cl_users,
-           'tasks' => $cl_tasks))) {
-           header('Location: projects.php');
-           exit();
+        // Update project information.
+        if (ttProjectHelper::update(array(
+          'id' => $cl_project_id,
+          'name' => $cl_name,
+          'description' => $cl_description,
+          'status' => $cl_status,
+          'users' => $cl_users,
+          'tasks' => $cl_tasks))) {
+          header('Location: projects.php');
+          exit();
         } else
-           $err->add($i18n->get('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.project_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
-        if (ttProjectHelper::insert(array(
-          'team_id' => $user->team_id,
-          'name' => $cl_name,
+        if (ttProjectHelper::insert(array('name' => $cl_name,
           'description' => $cl_description,
           'users' => $cl_users,
           'tasks' => $cl_tasks,
@@ -125,13 +122,15 @@ if ($request->isPost()) {
         } else
           $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.project_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="document.projectForm.name.focus()"');
+$smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
+$smarty->assign('show_users', count($users) > 0);
+$smarty->assign('show_tasks', $show_tasks);
 $smarty->assign('title', $i18n->get('title.edit_project'));
 $smarty->assign('content_page_name', 'project_edit.tpl');
 $smarty->display('index.tpl');