AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display column in link details

Browse Source
This commit is contained in:
BlueTeck
2015-02-20 14:52:25 +01:00
parent 8214aae1d6
commit cc12f5589a
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Model/TaskLink.php
View File

@@ -50,7 +50,8 @@ class TaskLink extends Base
Link::TABLE.'.label', Link::TABLE.'.label',
Task::TABLE.'.title', Task::TABLE.'.title',
Task::TABLE.'.is_active', Task::TABLE.'.is_active',
Task::TABLE.'.project_id' Task::TABLE.'.project_id',
Task::TABLE.'.column_id'
) )
->eq(self::TABLE.'.task_id', $task_id) ->eq(self::TABLE.'.task_id', $task_id)
->join(Link::TABLE, 'id', 'link_id') ->join(Link::TABLE, 'id', 'link_id')

2
app/Template/task/show.php
View File

@@ -1,7 +1,7 @@
<?= $this->render('task/details', array('task' => $task, 'project' => $project)) ?> <?= $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/time', array('task' => $task, 'values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?>
<?= $this->render('task/show_description', array('task' => $task)) ?> <?= $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('subtask/show', array('task' => $task, 'subtasks' => $subtasks)) ?>
<?= $this->render('task/timesheet', array('task' => $task)) ?> <?= $this->render('task/timesheet', array('task' => $task)) ?>
<?= $this->render('file/show', array('task' => $task, 'files' => $files)) ?> <?= $this->render('file/show', array('task' => $task, 'files' => $files)) ?>

4
app/Template/tasklink/show.php
View File

@@ -5,7 +5,8 @@
<table class="table-fixed" id="links"> <table class="table-fixed" id="links">
<tr> <tr>
<th class="column-30"><?= t('Label') ?></th> <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)): ?> <?php if (! isset($not_editable)): ?>
<th><?= t('Action') ?></th> <th><?= t('Action') ?></th>
<?php endif ?> <?php endif ?>
@@ -22,6 +23,7 @@
$link['is_active'] ? '' : 'task-link-closed' $link['is_active'] ? '' : 'task-link-closed'
) ?> ) ?>
</td> </td>
<td><?= $columns_list[$link['column_id']] ?></td>
<td> <td>
<?= $this->a(t('Remove'), 'tasklink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> <?= $this->a(t('Remove'), 'tasklink', 'confirm', array('link_id' => $link['id'], 'task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
</td> </td>