display column in link details
This commit is contained in:
parent
8214aae1d6
commit
cc12f5589a
|
|
@ -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')
|
||||
|
|
|
|||
|
|
@ -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)) ?>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue