diff options
| -rw-r--r-- | app/Model/TaskLink.php | 3 | ||||
| -rw-r--r-- | app/Template/task/show.php | 2 | ||||
| -rw-r--r-- | app/Template/tasklink/show.php | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/app/Model/TaskLink.php b/app/Model/TaskLink.php index c712e5a8..85ad2737 100644 --- a/app/Model/TaskLink.php +++ b/app/Model/TaskLink.php @@ -50,7 +50,8 @@ class TaskLink extends Base Link::TABLE.'.label', Task::TABLE.'.title', Task::TABLE.'.is_active', - Task::TABLE.'.project_id' + Task::TABLE.'.project_id', + Task::TABLE.'.column_id' ) ->eq(self::TABLE.'.task_id', $task_id) ->join(Link::TABLE, 'id', 'link_id') diff --git a/app/Template/task/show.php b/app/Template/task/show.php index 1ff2ef43..60243537 100644 --- a/app/Template/task/show.php +++ b/app/Template/task/show.php @@ -1,7 +1,7 @@ <?= $this->render('task/details', array('task' => $task, 'project' => $project)) ?> <?= $this->render('task/time', array('task' => $task, 'values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?> <?= $this->render('task/show_description', array('task' => $task)) ?> -<?= $this->render('tasklink/show', array('task' => $task, 'links' => $links)) ?> +<?= $this->render('tasklink/show', array('task' => $task, 'links' => $links, 'columns_list' => $columns_list)) ?> <?= $this->render('subtask/show', array('task' => $task, 'subtasks' => $subtasks)) ?> <?= $this->render('task/timesheet', array('task' => $task)) ?> <?= $this->render('file/show', array('task' => $task, 'files' => $files)) ?> diff --git a/app/Template/tasklink/show.php b/app/Template/tasklink/show.php index ca4e4383..f759be5e 100644 --- a/app/Template/tasklink/show.php +++ b/app/Template/tasklink/show.php @@ -5,7 +5,8 @@ <table class="table-fixed" id="links"> <tr> <th class="column-30"><?= t('Label') ?></th> - <th class="column-60"><?= t('Task') ?></th> + <th class="column-40"><?= t('Task') ?></th> + <th class="column-20"><?= t('Column') ?></th> <?php if (! isset($not_editable)): ?> <th><?= t('Action') ?></th> <?php endif ?> @@ -22,6 +23,7 @@ $link['is_active'] ? '' : 'task-link-closed' ) ?> </td> + <td><?= $columns_list[$link['column_id']] ?></td> <td> <?= $this->a(t('Remove'), 'tasklink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </td> |