diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php index 28ddb88fc..f8566bc29 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 71b625721..756bd9b42 100644 --- a/app/Template/dashboard/tasks.php +++ b/app/Template/dashboard/tasks.php @@ -11,7 +11,8 @@ order(t('Task'), 'title') ?> order('Priority', 'tasks.priority') ?> - order(t('Due date'), 'date_due') ?> + order(t('Due date'), 'date_due') ?> + order(t('Column'), 'column_title') ?> getCollection() as $task): ?> @@ -41,6 +42,9 @@ dt->date($task['date_due']) ?> + + text->e($task['column_title']) ?> +