diff options
| -rw-r--r-- | app/Model/TaskFilter.php | 10 | ||||
| -rw-r--r-- | tests/units/TaskFilterTest.php | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/Model/TaskFilter.php b/app/Model/TaskFilter.php index dfd97d9d..8d7bdb44 100644 --- a/app/Model/TaskFilter.php +++ b/app/Model/TaskFilter.php @@ -317,7 +317,7 @@ class TaskFilter extends Base switch ($assignee) { case 'me': $this->query->eq(Task::TABLE.'.owner_id', $this->userSession->getId()); - $subtaskQuery->eq(Subtask::TABLE.'user_id',$this->userSession->getId() ); + $subtaskQuery->eq(Subtask::TABLE.'.user_id',$this->userSession->getId() ); break; case 'nobody': $this->query->eq(Task::TABLE.'.owner_id', 0); @@ -325,8 +325,10 @@ class TaskFilter extends Base default: $this->query->ilike(User::TABLE.'.username', '%'.$assignee.'%'); $this->query->ilike(User::TABLE.'.name', '%'.$assignee.'%'); + $subtaskQuery->beginOr(); $subtaskQuery->ilike(User::TABLE.'.username', '%'.$assignee.'%'); $subtaskQuery->ilike(User::TABLE.'.name', '%'.$assignee.'%'); + $subtaskQuery->closeOr(); } if ($assignee != 'nobody'){ $subtasks = $subtaskQuery->findAll(); @@ -776,10 +778,8 @@ class TaskFilter extends Base User::TABLE.'.name', User::TABLE.'.username') ->join(User::TABLE, 'id', 'user_id', Subtask::TABLE) - ->beginOr() - ->eq(Subtask::TABLE.'.status', Subtask::STATUS_TODO) - ->eq(Subtask::TABLE.'.status', Subtask::STATUS_INPROGRESS) - ->closeOr(); + ->neq(Subtask::TABLE.'.status', Subtask::STATUS_DONE); + } private function addTasksWithFoundSubtask($subtasks) { diff --git a/tests/units/TaskFilterTest.php b/tests/units/TaskFilterTest.php index 98142ec7..fede157e 100644 --- a/tests/units/TaskFilterTest.php +++ b/tests/units/TaskFilterTest.php @@ -479,7 +479,7 @@ class TaskFilterTest extends Base $tf = new TaskFilter($this->container); $this->assertEquals(1, $p->create(array('name' => 'test'))); - $this->assertEquals(2, $u->create(array('username' => 'bob', 'name' => 'Bob Ryan'))); + $this->assertEquals(2, $u->create(array('username' => 'bob', 'name' => 'Paul Ryan'))); $this->assertEquals(1,$tc->create(array('project_id' => 1, 'title' => 'my task title is awesome', 'owner_id' => 2))); $this->assertEquals(1, $s->create(array('title' => 'subtask #1', 'task_id' => 1, 'status' => 1, 'another_subtask' => 'on', 'user_id' => 0))); $this->assertEquals(2,$tc->create(array('project_id' => 1, 'title' => 'my task title is amazing', 'owner_id' => 0))); |