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

Add description attribute for advanced search

Browse Source
This commit is contained in:
Frederic Guillot
2015-06-28 21:04:37 -04:00
parent 2e7e703180
commit 7c1222fc59
5 changed files with 80 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Core/Lexer.php
View File

@@ -29,7 +29,7 @@ class Lexer
"/^(color:)/" => 'T_COLOR',
"/^(due:)/" => 'T_DUE',
"/^(status:)/" => 'T_STATUS',
"/^(title:)/" => 'T_TITLE',
"/^(description:)/" => 'T_DESCRIPTION',
"/^(\s+)/" => 'T_WHITESPACE',
'/^([<=>]{0,2}[0-9]{4}-[0-9]{2}-[0-9]{2})/' => 'T_DATE',
'/^(yesterday|tomorrow|today)/' => 'T_DATE',
@@ -117,6 +117,7 @@ class Lexer
case 'T_STATUS':
case 'T_DUE':
case 'T_DESCRIPTION':
$next = next($tokens);
if ($next !== false && ($next['token'] === 'T_DATE' || $next['token'] === 'T_STRING')) {

46
app/Model/TaskFilter.php
View File

@@ -56,6 +56,9 @@ class TaskFilter extends Base
case 'T_STATUS':
$this->filterByStatusName($value);
break;
case 'T_DESCRIPTION':
$this->filterByDescription($value);
break;
}
}
@@ -128,6 +131,19 @@ class TaskFilter extends Base
return $this;
}
/**
* Filter by title
*
* @access public
* @param string $title
* @return TaskFilter
*/
public function filterByDescription($title)
{
$this->query->ilike(Task::TABLE.'.description', '%'.$title.'%');
return $this;
}
/**
* Filter by title
*
@@ -137,7 +153,7 @@ class TaskFilter extends Base
*/
public function filterByTitle($title)
{
$this->query->ilike('title', '%'.$title.'%');
$this->query->ilike(Task::TABLE.'.title', '%'.$title.'%');
return $this;
}
@@ -150,7 +166,7 @@ class TaskFilter extends Base
*/
public function filterByProjects(array $project_ids)
{
$this->query->in('project_id', $project_ids);
$this->query->in(Task::TABLE.'.project_id', $project_ids);
return $this;
}
@@ -164,7 +180,7 @@ class TaskFilter extends Base
public function filterByProject($project_id)
{
if ($project_id > 0) {
$this->query->eq('project_id', $project_id);
$this->query->eq(Task::TABLE.'.project_id', $project_id);
}
return $this;
@@ -180,7 +196,7 @@ class TaskFilter extends Base
public function filterByCategory($category_id)
{
if ($category_id >= 0) {
$this->query->eq('category_id', $category_id);
$this->query->eq(Task::TABLE.'.category_id', $category_id);
}
return $this;
@@ -196,7 +212,7 @@ class TaskFilter extends Base
public function filterByOwner($owner_id)
{
if ($owner_id >= 0) {
$this->query->eq('owner_id', $owner_id);
$this->query->eq(Task::TABLE.'.owner_id', $owner_id);
}
return $this;
@@ -217,10 +233,10 @@ class TaskFilter extends Base
switch ($assignee) {
case 'me':
$this->query->eq('owner_id', $this->userSession->getId());
$this->query->eq(Task::TABLE.'.owner_id', $this->userSession->getId());
break;
case 'nobody':
$this->query->eq('owner_id', 0);
$this->query->eq(Task::TABLE.'.owner_id', 0);
break;
default:
$this->query->ilike(User::TABLE.'.username', '%'.$assignee.'%');
@@ -241,7 +257,7 @@ class TaskFilter extends Base
public function filterByColor($color_id)
{
if ($color_id !== '') {
$this->query->eq('color_id', $color_id);
$this->query->eq(Task::TABLE.'.color_id', $color_id);
}
return $this;
@@ -277,7 +293,7 @@ class TaskFilter extends Base
public function filterByColumn($column_id)
{
if ($column_id >= 0) {
$this->query->eq('column_id', $column_id);
$this->query->eq(Task::TABLE.'.column_id', $column_id);
}
return $this;
@@ -293,7 +309,7 @@ class TaskFilter extends Base
public function filterBySwimlane($swimlane_id)
{
if ($swimlane_id >= 0) {
$this->query->eq('swimlane_id', $swimlane_id);
$this->query->eq(Task::TABLE.'.swimlane_id', $swimlane_id);
}
return $this;
@@ -325,7 +341,7 @@ class TaskFilter extends Base
public function filterByStatus($is_active)
{
if ($is_active >= 0) {
$this->query->eq('is_active', $is_active);
$this->query->eq(Task::TABLE.'.is_active', $is_active);
}
return $this;
@@ -340,10 +356,10 @@ class TaskFilter extends Base
*/
public function filterByDueDate($date)
{
$this->query->neq('date_due', '');
$this->query->neq('date_due', 0);
$this->query->notNull('date_due');
return $this->filterWithOperator('date_due', $date, true);
$this->query->neq(Task::TABLE.'.date_due', '');
$this->query->neq(Task::TABLE.'.date_due', 0);
$this->query->notNull(Task::TABLE.'.date_due');
return $this->filterWithOperator(Task::TABLE.'.date_due', $date, true);
}
/**