diff options
author | Frederic Guillot <fred@kanboard.net> | 2015-02-14 16:11:13 -0500 |
---|---|---|
committer | Frederic Guillot <fred@kanboard.net> | 2015-02-14 16:11:13 -0500 |
commit | f7e4c3928aba9cb7f5222cb4af67846312bbb435 (patch) | |
tree | 78f5854a0bdc538c977bad718a11d605a4caaca6 /app/Template/task | |
parent | 364382b1b58db8bf1bd2c8866e21c869a7a5d6d0 (diff) |
Refactoring/simplification of the pull-request about links
Diffstat (limited to 'app/Template/task')
-rw-r--r-- | app/Template/task/public.php | 12 | ||||
-rw-r--r-- | app/Template/task/show.php | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/Template/task/public.php b/app/Template/task/public.php index c66b2433..d7acef9f 100644 --- a/app/Template/task/public.php +++ b/app/Template/task/public.php @@ -10,19 +10,19 @@ 'is_public' => true )) ?> - <?= $this->render('subtask/show', array( + <?= $this->render('tasklink/show', array( 'task' => $task, - 'subtasks' => $subtasks, + 'links' => $links, + 'project' => $project, 'not_editable' => true )) ?> - <?= $this->render('tasklink/show', array( + <?= $this->render('subtask/show', array( 'task' => $task, - 'links' => $links, - 'project' => $project, + 'subtasks' => $subtasks, 'not_editable' => true )) ?> - + <?= $this->render('task/comments', array( 'task' => $task, 'comments' => $comments, diff --git a/app/Template/task/show.php b/app/Template/task/show.php index f968a409..1ff2ef43 100644 --- a/app/Template/task/show.php +++ b/app/Template/task/show.php @@ -1,8 +1,8 @@ <?= $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('subtask/show', array('task' => $task, 'subtasks' => $subtasks)) ?> <?= $this->render('task/timesheet', array('task' => $task)) ?> -<?= $this->render('tasklink/show', array('task' => $task, 'links' => $links, 'link_list' => $link_list, 'task_list' => $task_list)) ?> <?= $this->render('file/show', array('task' => $task, 'files' => $files)) ?> <?= $this->render('task/comments', array('task' => $task, 'comments' => $comments, 'project' => $project)) ?> |