diff options
| author | Frederic Guillot <fred@kanboard.net> | 2015-02-21 13:40:24 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2015-02-21 13:40:24 -0500 |
| commit | 658e668a77fe5ae42c51cf56a632c42a28a62685 (patch) | |
| tree | 755ca462c86bca571cf6637511968e1879666e41 /app/Template | |
| parent | c28eefa100b896ebe7342a846ead805bc658bf4d (diff) | |
| parent | cc12f5589a1ab8a0cb629748d34f361c2f402df7 (diff) | |
Merge pull-request #644
Diffstat (limited to 'app/Template')
| -rw-r--r-- | app/Template/task/show.php | 2 | ||||
| -rw-r--r-- | app/Template/tasklink/show.php | 4 |
2 files changed, 4 insertions, 2 deletions
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> |