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

Add support for reference:none

Browse Source
This commit is contained in:
Frédéric Guillot
2019-07-17 14:45:09 -07:00
parent ff53a6aa6b
commit 051c36f597
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Filter/TaskReferenceFilter.php
View File

@@ -32,6 +32,14 @@ class TaskReferenceFilter extends BaseFilter implements FilterInterface
*/ */
public function apply() public function apply()
{ {
if ($this->value === 'none') {
$this->query->beginOr();
$this->query->eq(TaskModel::TABLE.'.reference', '');
$this->query->isNull(TaskModel::TABLE.'.reference');
$this->query->closeOr();
return $this;
}
if (strpos($this->value, '*') >= 0) { if (strpos($this->value, '*') >= 0) {
$this->query->ilike(TaskModel::TABLE.'.reference', str_replace('*', '%', $this->value)); $this->query->ilike(TaskModel::TABLE.'.reference', str_replace('*', '%', $this->value));
return $this; return $this;

19
tests/units/Filter/TaskReferenceFilterTest.php
View File

@@ -62,4 +62,23 @@ class TaskReferenceFilterTest extends Base
$this->assertCount(1, $query->findAll()); $this->assertCount(1, $query->findAll());
} }
public function testWithNone()
{
$taskFinder = new TaskFinderModel($this->container);
$taskCreation = new TaskCreationModel($this->container);
$projectModel = new ProjectModel($this->container);
$query = $taskFinder->getExtendedQuery();
$this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
$this->assertEquals(1, $taskCreation->create(array('title' => 'A', 'project_id' => 1, 'reference' => 'aaa-bbb')));
$this->assertEquals(2, $taskCreation->create(array('title' => 'B', 'project_id' => 1)));
$filter = new TaskReferenceFilter();
$filter->withQuery($query);
$filter->withValue('none');
$filter->apply();
$this->assertCount(1, $query->findAll());
}
} }