Added search by task creator
This commit is contained in:
74
app/Filter/TaskCreatorFilter.php
Normal file
74
app/Filter/TaskCreatorFilter.php
Normal file
@@ -0,0 +1,74 @@
|
||||
<?php
|
||||
|
||||
namespace Kanboard\Filter;
|
||||
|
||||
use Kanboard\Core\Filter\FilterInterface;
|
||||
use Kanboard\Model\Task;
|
||||
|
||||
/**
|
||||
* Filter tasks by creator
|
||||
*
|
||||
* @package filter
|
||||
* @author Frederic Guillot
|
||||
*/
|
||||
class TaskCreatorFilter extends BaseFilter implements FilterInterface
|
||||
{
|
||||
/**
|
||||
* Current user id
|
||||
*
|
||||
* @access private
|
||||
* @var int
|
||||
*/
|
||||
private $currentUserId = 0;
|
||||
|
||||
/**
|
||||
* Set current user id
|
||||
*
|
||||
* @access public
|
||||
* @param integer $userId
|
||||
* @return TaskAssigneeFilter
|
||||
*/
|
||||
public function setCurrentUserId($userId)
|
||||
{
|
||||
$this->currentUserId = $userId;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get search attribute
|
||||
*
|
||||
* @access public
|
||||
* @return string[]
|
||||
*/
|
||||
public function getAttributes()
|
||||
{
|
||||
return array('creator');
|
||||
}
|
||||
|
||||
/**
|
||||
* Apply filter
|
||||
*
|
||||
* @access public
|
||||
* @return string
|
||||
*/
|
||||
public function apply()
|
||||
{
|
||||
if (is_int($this->value) || ctype_digit($this->value)) {
|
||||
$this->query->eq(Task::TABLE.'.creator_id', $this->value);
|
||||
} else {
|
||||
switch ($this->value) {
|
||||
case 'me':
|
||||
$this->query->eq(Task::TABLE.'.creator_id', $this->currentUserId);
|
||||
break;
|
||||
case 'nobody':
|
||||
$this->query->eq(Task::TABLE.'.creator_id', 0);
|
||||
break;
|
||||
default:
|
||||
$this->query->beginOr();
|
||||
$this->query->ilike('uc.username', '%'.$this->value.'%');
|
||||
$this->query->ilike('uc.name', '%'.$this->value.'%');
|
||||
$this->query->closeOr();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -138,6 +138,7 @@ class TaskFinder extends Base
|
||||
Project::TABLE.'.name AS project_name'
|
||||
)
|
||||
->join(User::TABLE, 'id', 'owner_id', Task::TABLE)
|
||||
->left(User::TABLE, 'uc', 'id', Task::TABLE, 'creator_id')
|
||||
->join(Category::TABLE, 'id', 'category_id', Task::TABLE)
|
||||
->join(Column::TABLE, 'id', 'column_id', Task::TABLE)
|
||||
->join(Swimlane::TABLE, 'id', 'swimlane_id', Task::TABLE)
|
||||
|
||||
@@ -10,6 +10,7 @@ use Kanboard\Filter\TaskColorFilter;
|
||||
use Kanboard\Filter\TaskColumnFilter;
|
||||
use Kanboard\Filter\TaskCommentFilter;
|
||||
use Kanboard\Filter\TaskCreationDateFilter;
|
||||
use Kanboard\Filter\TaskCreatorFilter;
|
||||
use Kanboard\Filter\TaskDescriptionFilter;
|
||||
use Kanboard\Filter\TaskDueDateFilter;
|
||||
use Kanboard\Filter\TaskIdFilter;
|
||||
@@ -84,10 +85,15 @@ class FilterProvider implements ServiceProviderInterface
|
||||
->setCurrentUserId($c['userSession']->getId())
|
||||
)
|
||||
->withFilter(new TaskCategoryFilter())
|
||||
->withFilter(TaskColorFilter::getInstance()->setColorModel($c['color']))
|
||||
->withFilter(TaskColorFilter::getInstance()
|
||||
->setColorModel($c['color'])
|
||||
)
|
||||
->withFilter(new TaskColumnFilter())
|
||||
->withFilter(new TaskCommentFilter())
|
||||
->withFilter(new TaskCreationDateFilter())
|
||||
->withFilter(TaskCreatorFilter::getInstance()
|
||||
->setCurrentUserId($c['userSession']->getId())
|
||||
)
|
||||
->withFilter(new TaskDescriptionFilter())
|
||||
->withFilter(new TaskDueDateFilter())
|
||||
->withFilter(new TaskIdFilter())
|
||||
|
||||
Reference in New Issue
Block a user