diff options
| author | Frederic Guillot <fred@kanboard.net> | 2016-05-24 22:14:48 -0400 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2016-05-24 22:14:48 -0400 |
| commit | 5b30cd43d4c4197f40fde979e4afdd4ff2518442 (patch) | |
| tree | 6b54ec24577368df9f95f3d005823d2addc06f3a /app | |
| parent | 47ec4d89bccdd2abfda21d818b0f27d389324cc8 (diff) | |
| parent | 454f47a94a7039fb9929c68d30b995ee71f7f13f (diff) | |
Merge pull-request #2261
Diffstat (limited to 'app')
| -rw-r--r-- | app/Model/TaskFinder.php | 4 | ||||
| -rw-r--r-- | app/Template/dashboard/tasks.php | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php index 28ddb88f..f8566bc2 100644 --- a/app/Model/TaskFinder.php +++ b/app/Model/TaskFinder.php @@ -73,9 +73,11 @@ class TaskFinder extends Base 'tasks.time_estimated', 'tasks.is_active', 'tasks.creator_id', - 'projects.name AS project_name' + 'projects.name AS project_name', + 'columns.title AS column_title' ) ->join(Project::TABLE, 'id', 'project_id') + ->join(Column::TABLE, 'id', 'column_id') ->eq(Task::TABLE.'.owner_id', $user_id) ->eq(Task::TABLE.'.is_active', Task::STATUS_OPEN) ->eq(Project::TABLE.'.is_active', Project::ACTIVE); diff --git a/app/Template/dashboard/tasks.php b/app/Template/dashboard/tasks.php index 71b62572..756bd9b4 100644 --- a/app/Template/dashboard/tasks.php +++ b/app/Template/dashboard/tasks.php @@ -11,7 +11,8 @@ <th><?= $paginator->order(t('Task'), 'title') ?></th> <th class="column-5"><?= $paginator->order('Priority', 'tasks.priority') ?></th> <th class="column-20"><?= t('Time tracking') ?></th> - <th class="column-20"><?= $paginator->order(t('Due date'), 'date_due') ?></th> + <th class="column-10"><?= $paginator->order(t('Due date'), 'date_due') ?></th> + <th class="column-10"><?= $paginator->order(t('Column'), 'column_title') ?></th> </tr> <?php foreach ($paginator->getCollection() as $task): ?> <tr> @@ -41,6 +42,9 @@ <td> <?= $this->dt->date($task['date_due']) ?> </td> + <td> + <?= $this->text->e($task['column_title']) ?> + </td> </tr> <?php endforeach ?> </table> |