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

Fix task filter issue

This commit is contained in:
Frederic Guillot 2015-06-27 23:08:11 -04:00
parent ff030d43c3
commit 7b9733f672
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Model/TaskFilter.php
View File

@ -56,6 +56,7 @@ class TaskFilter extends Base
{
$filter = clone($this);
$filter->query = clone($this->query);
$filter->query->condition = clone($this->query->condition);
return $filter;
}
@ -301,7 +302,7 @@ class TaskFilter extends Base
*/
public function toAutoCompletion()
{
return $this->query->columns('id', 'title')->callback(function(array $results) {
return $this->query->columns(Task::TABLE.'.id', Task::TABLE.'.title')->callback(function(array $results) {
foreach ($results as &$result) {
$result['value'] = $result['title'];

6
app/Model/TaskLink.php
View File

@ -82,7 +82,11 @@ class TaskLink extends Base
->join(Task::TABLE, 'id', 'opposite_task_id')
->join(Board::TABLE, 'id', 'column_id', Task::TABLE)
->join(User::TABLE, 'id', 'owner_id', Task::TABLE)
->orderBy(Link::TABLE.'.id ASC, '.Board::TABLE.'.position DESC, '.Task::TABLE.'.is_active DESC, '.Task::TABLE.'.position ASC, '.Task::TABLE.'.id', Table::SORT_ASC)
->asc(Link::TABLE.'.id')
->desc(Board::TABLE.'.position')
->desc(Task::TABLE.'.is_active')
->asc(Task::TABLE.'.position')
->asc(Task::TABLE.'.id')
->findAll();
}

19
tests/units/TaskFilterTest.php Normal file
View File

@ -0,0 +1,19 @@
<?php
require_once __DIR__.'/Base.php';
use Model\TaskFilter;
class TaskFilterTest extends Base
{
public function testCopy()
{
$tf = new TaskFilter($this->container);
$filter1 = $tf->create();
$filter2 = $tf->copy();
$this->assertTrue($filter1 !== $filter2);
$this->assertTrue($filter1->query !== $filter2->query);
$this->assertTrue($filter1->query->condition !== $filter2->query->condition);
}
}