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

Add global search section

Browse Source
This commit is contained in:
Frederic Guillot
2015-07-01 18:28:32 -04:00
parent 109a2a2e25
commit 31f3de9646
14 changed files with 186 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/Color.php
View File

@@ -193,11 +193,11 @@ class Color extends Base
$buffer = '';
foreach ($this->default_colors as $color => $values) {
$buffer .= 'td.color-'.$color.',';
$buffer .= 'div.color-'.$color.' {';
$buffer .= 'background-color: '.$values['background'].';';
$buffer .= 'border-color: '.$values['border'];
$buffer .= '}';
$buffer .= 'td.color-'.$color.' { background-color: '.$values['background'].'}';
}
return $buffer;

1
app/Model/TaskFilter.php
View File

@@ -214,7 +214,6 @@ class TaskFilter extends Base
*/
public function filterByCategoryName(array $values)
{
$this->query->join(Category::TABLE, 'id', 'category_id');
$this->query->beginOr();
foreach ($values as $category) {

22
app/Model/TaskFinder.php
View File

@@ -97,10 +97,16 @@ class TaskFinder extends Base
'tasks.recurrence_parent',
'tasks.recurrence_child',
'tasks.time_estimated',
'users.username AS assignee_username',
'users.name AS assignee_name'
User::TABLE.'.username AS assignee_username',
User::TABLE.'.name AS assignee_name',
Category::TABLE.'.name AS category_name',
Board::TABLE.'.title AS column_name',
Project::TABLE.'.name AS project_name'
)
->join(User::TABLE, 'id', 'owner_id');
->join(User::TABLE, 'id', 'owner_id', Task::TABLE)
->join(Category::TABLE, 'id', 'category_id', Task::TABLE)
->join(Board::TABLE, 'id', 'column_id', Task::TABLE)
->join(Project::TABLE, 'id', 'project_id', Task::TABLE);
}
/**
@@ -115,11 +121,11 @@ class TaskFinder extends Base
public function getTasksByColumnAndSwimlane($project_id, $column_id, $swimlane_id = 0)
{
return $this->getExtendedQuery()
->eq('project_id', $project_id)
->eq('column_id', $column_id)
->eq('swimlane_id', $swimlane_id)
->eq('is_active', Task::STATUS_OPEN)
->asc('tasks.position')
->eq(Task::TABLE.'.project_id', $project_id)
->eq(Task::TABLE.'.column_id', $column_id)
->eq(Task::TABLE.'.swimlane_id', $swimlane_id)
->eq(Task::TABLE.'.is_active', Task::STATUS_OPEN)
->asc(Task::TABLE.'.position')
->findAll();
}