Fix task filter issue
This commit is contained in:
@@ -56,6 +56,7 @@ class TaskFilter extends Base
|
|||||||
{
|
{
|
||||||
$filter = clone($this);
|
$filter = clone($this);
|
||||||
$filter->query = clone($this->query);
|
$filter->query = clone($this->query);
|
||||||
|
$filter->query->condition = clone($this->query->condition);
|
||||||
return $filter;
|
return $filter;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -301,7 +302,7 @@ class TaskFilter extends Base
|
|||||||
*/
|
*/
|
||||||
public function toAutoCompletion()
|
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) {
|
foreach ($results as &$result) {
|
||||||
$result['value'] = $result['title'];
|
$result['value'] = $result['title'];
|
||||||
|
|||||||
@@ -82,7 +82,11 @@ class TaskLink extends Base
|
|||||||
->join(Task::TABLE, 'id', 'opposite_task_id')
|
->join(Task::TABLE, 'id', 'opposite_task_id')
|
||||||
->join(Board::TABLE, 'id', 'column_id', Task::TABLE)
|
->join(Board::TABLE, 'id', 'column_id', Task::TABLE)
|
||||||
->join(User::TABLE, 'id', 'owner_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();
|
->findAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
19
tests/units/TaskFilterTest.php
Normal file
19
tests/units/TaskFilterTest.php
Normal 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user