diff --git a/module/task/model.php b/module/task/model.php index 704ed43c65..7d1a4f4e95 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -1260,7 +1260,7 @@ class taskModel extends model $task->team = $this->dao->select('*')->from(TABLE_TASKTEAM)->where('task')->eq($taskID)->orderBy('order')->fetchAll('id'); /* Check if the current user is in the team. */ - $inTeam = empty($task->team) ? true : false; + $inTeam = empty($task->team); foreach($task->team as $teamMember) { if($teamMember->account == $this->app->user->account) $inTeam = true; diff --git a/module/task/tao.php b/module/task/tao.php index 9c645d25d5..08017be2dd 100644 --- a/module/task/tao.php +++ b/module/task/tao.php @@ -188,7 +188,7 @@ class taskTao extends taskModel ->page($pager, 't1.id') ->fetchAll('id'); - $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'task', ($productID || in_array($type, array('myinvolved', 'needconfirm', 'assignedtome'))) ? false : true); + $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'task', !($productID || in_array($type, array('myinvolved', 'needconfirm', 'assignedtome')))); return $tasks; } @@ -701,7 +701,7 @@ class taskTao extends taskModel protected function updateTaskEsDateByGantt(int $taskID, object $postData): bool { $task = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch(); - $isChildTask = $task->parent > 0 ? true : false; + $isChildTask = $task->parent > 0; if($isChildTask) $parentTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($task->parent)->fetch(); $stage = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($task->execution)->andWhere('project')->eq($task->project)->fetch(); diff --git a/module/task/ui/edit.html.php b/module/task/ui/edit.html.php index 025aa888ab..52b0921ddb 100644 --- a/module/task/ui/edit.html.php +++ b/module/task/ui/edit.html.php @@ -199,7 +199,7 @@ formPanel 'name' => "assignedTo", 'id' => "assignedTo", 'value' => $task->assignedTo, - 'disabled' => (!empty($task->team) and $task->mode == 'linear') ? true : false, + 'disabled' => !empty($task->team) && $task->mode == 'linear', 'type' => "picker", 'items' => $assignedToOptions ))),