A bit more refactoring ttProjectHelper class for subgroups.

[timetracker.git] / mobile / project_edit.php

diff --git a/mobile/project_edit.php b/mobile/project_edit.php
index 74454ec410b4c71a0bad94e16e7e55c75b381c3c..8bccd1107559a3b862eb6c8da6c1136db2d23c40 100644 (file)
--- a/mobile/project_edit.php
+++ b/mobile/project_edit.php
@@ -29,7 +29,7 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttProjectHelper');
-import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_projects')) {
@@ -40,14 +40,19 @@ if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->t
   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'];
 
@@ -58,7 +63,6 @@ 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'];
@@ -91,6 +95,8 @@ 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')) {
@@ -109,14 +115,12 @@ 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'));
     }
 
     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,
@@ -126,7 +130,7 @@ 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'));
     }
     
     if ($request->getParameter('btn_delete')) {