AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected some SQL Spelling Erorrs

Browse Source
This commit is contained in:
Lesstat
2015-07-12 09:52:44 +02:00
parent a85a1c6132
commit 0f2d57ca5b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Model/TaskFilter.php
View File

@@ -317,7 +317,7 @@ class TaskFilter extends Base
switch ($assignee) { switch ($assignee) {
case 'me': case 'me':
$this->query->eq(Task::TABLE.'.owner_id', $this->userSession->getId()); $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; break;
case 'nobody': case 'nobody':
$this->query->eq(Task::TABLE.'.owner_id', 0); $this->query->eq(Task::TABLE.'.owner_id', 0);
@@ -325,8 +325,10 @@ class TaskFilter extends Base
default: default:
$this->query->ilike(User::TABLE.'.username', '%'.$assignee.'%'); $this->query->ilike(User::TABLE.'.username', '%'.$assignee.'%');
$this->query->ilike(User::TABLE.'.name', '%'.$assignee.'%'); $this->query->ilike(User::TABLE.'.name', '%'.$assignee.'%');
$subtaskQuery->beginOr();
$subtaskQuery->ilike(User::TABLE.'.username', '%'.$assignee.'%'); $subtaskQuery->ilike(User::TABLE.'.username', '%'.$assignee.'%');
$subtaskQuery->ilike(User::TABLE.'.name', '%'.$assignee.'%'); $subtaskQuery->ilike(User::TABLE.'.name', '%'.$assignee.'%');
$subtaskQuery->closeOr();
} }
if ($assignee != 'nobody'){ if ($assignee != 'nobody'){
$subtasks = $subtaskQuery->findAll(); $subtasks = $subtaskQuery->findAll();
@@ -776,10 +778,8 @@ class TaskFilter extends Base
User::TABLE.'.name', User::TABLE.'.name',
User::TABLE.'.username') User::TABLE.'.username')
->join(User::TABLE, 'id', 'user_id', Subtask::TABLE) ->join(User::TABLE, 'id', 'user_id', Subtask::TABLE)
->beginOr() ->neq(Subtask::TABLE.'.status', Subtask::STATUS_DONE);
->eq(Subtask::TABLE.'.status', Subtask::STATUS_TODO)
->eq(Subtask::TABLE.'.status', Subtask::STATUS_INPROGRESS)
->closeOr();
} }
private function addTasksWithFoundSubtask($subtasks) { private function addTasksWithFoundSubtask($subtasks) {

2
tests/units/TaskFilterTest.php
View File

@@ -479,7 +479,7 @@ class TaskFilterTest extends Base
$tf = new TaskFilter($this->container); $tf = new TaskFilter($this->container);
$this->assertEquals(1, $p->create(array('name' => 'test'))); $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,$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(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))); $this->assertEquals(2,$tc->create(array('project_id' => 1, 'title' => 'my task title is amazing', 'owner_id' => 0)));