diff options
| author | Frederic Guillot <fred@kanboard.net> | 2015-02-21 14:24:00 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2015-02-21 14:24:00 -0500 |
| commit | 5f1dcf1ae8a978c996455824dc80bf77853f70c6 (patch) | |
| tree | 0cd7d3e51882e8d9ae56a00afed498647d090781 /app/Template | |
| parent | 651528d705ba8d6f4f5e13bb292e460e9e992f89 (diff) | |
Fix bug links with different columns (pull-request merge)
Diffstat (limited to 'app/Template')
| -rw-r--r-- | app/Template/task/show.php | 2 | ||||
| -rw-r--r-- | app/Template/tasklink/show.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/Template/task/show.php b/app/Template/task/show.php index 60243537..1ff2ef43 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, 'columns_list' => $columns_list)) ?> +<?= $this->render('tasklink/show', array('task' => $task, 'links' => $links)) ?> <?= $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 f759be5e..f0a70054 100644 --- a/app/Template/tasklink/show.php +++ b/app/Template/tasklink/show.php @@ -23,7 +23,7 @@ $link['is_active'] ? '' : 'task-link-closed' ) ?> </td> - <td><?= $columns_list[$link['column_id']] ?></td> + <td><?= $this->e($link['column_title']) ?></td> <td> <?= $this->a(t('Remove'), 'tasklink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </td> |