X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttProjectHelper.class.php;h=240760df38105444b66cabb5996d8357dbbb5b2e;hb=7faef0e6d81444ad3ae10d1a2ce62fa753c80a9f;hp=72b7171174d82a5e72905f149482aa8a866c0e53;hpb=a711e76851f29c7e0ac290a279eb4dd984ea7167;p=timetracker.git diff --git a/WEB-INF/lib/ttProjectHelper.class.php b/WEB-INF/lib/ttProjectHelper.class.php index 72b71711..240760df 100644 --- a/WEB-INF/lib/ttProjectHelper.class.php +++ b/WEB-INF/lib/ttProjectHelper.class.php @@ -214,8 +214,8 @@ class ttProjectHelper { $active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true)); foreach ($active_users as $u) { if(in_array($u['id'], $users)) { - $sql = "insert into tt_user_project_binds (project_id, user_id, status, rate) values( - $last_id, ".$u['id'].", 1, ".$u['rate'].")"; + $sql = "insert into tt_user_project_binds (project_id, user_id, group_id, org_id, status, rate) values( + $last_id, ".$u['id'].", $group_id, $org_id, 1, ".$u['rate'].")"; $affected = $mdb2->exec($sql); if (is_a($affected, 'PEAR_Error')) return false; @@ -226,7 +226,8 @@ class ttProjectHelper { $all_tasks = ttTeamHelper::getAllTasks($group_id); foreach ($all_tasks as $task) { if(in_array($task['id'], $tasks)) { - $sql = "insert into tt_project_task_binds (project_id, task_id) values($last_id, ".$task['id'].")"; + $sql = "insert into tt_project_task_binds (project_id, task_id, group_id, org_id)". + " values($last_id, ".$task['id'].", $group_id, $org_id)"; $affected = $mdb2->exec($sql); if (is_a($affected, 'PEAR_Error')) return false; @@ -240,7 +241,9 @@ class ttProjectHelper { static function update($fields) { global $user; $mdb2 = getConnection(); - + + $group_id = $user->getActiveGroup(); + $org_id = $user->org_id; $project_id = $fields['id']; // Project we are updating. $name = $fields['name']; // Project name. $description = $fields['description']; // Project description. @@ -272,7 +275,8 @@ class ttProjectHelper { $user_rate[$row['id']] = $row['rate']; } foreach ($users_to_add as $id) { - $sql = "insert into tt_user_project_binds (user_id, project_id, rate, status) values($id, $project_id, ".$user_rate[$id].", 1)"; + $sql = "insert into tt_user_project_binds (user_id, project_id, group_id, org_id, rate, status)". + " values($id, $project_id, $group_id, $org_id, ".$user_rate[$id].", 1)"; $affected = $mdb2->exec($sql); if (is_a($affected, 'PEAR_Error')) return false; @@ -305,7 +309,8 @@ class ttProjectHelper { return false; } foreach ($task_binds_to_add as $task_id) { - $sql = "insert into tt_project_task_binds (project_id, task_id) values($project_id, $task_id)"; + $sql = "insert into tt_project_task_binds (project_id, task_id, group_id, org_id)". + " values($project_id, $task_id, $group_id, $org_id)"; $affected = $mdb2->exec($sql); if (is_a($affected, 'PEAR_Error')) return false;