diff --git a/module/project/model.php b/module/project/model.php index d981c8fce6..62e0f2c641 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1795,15 +1795,15 @@ class projectModel extends model } /** - * Get team slice. + * Get the skip members of the team. * - * @param array $teams - * @param string $begin - * @param string $end + * @param array $teams + * @param string $begin + * @param string $end * @access public * @return array */ - public function getTeamSlice($teams, $begin, $end) + public function getTeamSkip($teams, $begin, $end) { $members = array(); foreach($teams as $account => $team) diff --git a/module/task/model.php b/module/task/model.php index a7552a5415..90e2afef2d 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -853,7 +853,7 @@ class taskModel extends model foreach($teams as $member) $this->dao->insert(TABLE_TEAM)->data($member)->autoCheck()->exec(); /* Assign the left hours to zero who will be skipped. */ - $sliceMembers = $this->loadModel('project')->getTeamSlice($oldTask->team, $oldTask->assignedTo, $task->assignedTo); + $sliceMembers = $this->loadModel('project')->getTeamSkip($oldTask->team, $oldTask->assignedTo, $task->assignedTo); foreach($sliceMembers as $account => $team) $this->dao->update(TABLE_TEAM)->set('left')->eq(0)->where('root')->eq($taskID)->andWhere('type')->eq('task')->andWhere('account')->eq($account)->exec(); $task = $this->computeHours4Multiple($oldTask, $task, array(), $autoStatus = false); @@ -1218,7 +1218,7 @@ class taskModel extends model if(!empty($oldTask->team)) { - $sliceMembers = $this->loadModel('project')->getTeamSlice($oldTask->team, $oldTask->assignedTo, $task->assignedTo); + $sliceMembers = $this->loadModel('project')->getTeamSkip($oldTask->team, $oldTask->assignedTo, $task->assignedTo); foreach($sliceMembers as $account => $team) $this->dao->update(TABLE_TEAM)->set('left')->eq(0)->where('root')->eq($taskID)->andWhere('type')->eq('task')->andWhere('account')->eq($account)->exec(); $this->dao->update(TABLE_TEAM)->set('left')->eq($task->left) @@ -1548,7 +1548,7 @@ class taskModel extends model ->andWhere('type')->eq('task') ->andWhere('account')->eq($oldTask->assignedTo)->exec(); - $sliceMembers = $this->loadModel('project')->getTeamSlice($oldTask->team, $oldTask->assignedTo, $task->assignedTo); + $sliceMembers = $this->loadModel('project')->getTeamSkip($oldTask->team, $oldTask->assignedTo, $task->assignedTo); foreach($sliceMembers as $account => $team) $this->dao->update(TABLE_TEAM)->set('left')->eq(0)->where('root')->eq($taskID)->andWhere('type')->eq('task')->andWhere('account')->eq($account)->exec(); $task = $this->computeHours4Multiple($oldTask, $task);