diff options
Diffstat (limited to 'app/Template/task')
| -rw-r--r-- | app/Template/task/show.php | 1 | ||||
| -rw-r--r-- | app/Template/task/sidebar.php | 15 |
2 files changed, 13 insertions, 3 deletions
diff --git a/app/Template/task/show.php b/app/Template/task/show.php index 5fd73afb..246c8f33 100644 --- a/app/Template/task/show.php +++ b/app/Template/task/show.php @@ -19,6 +19,7 @@ 'project' => $project, 'users_list' => isset($users_list) ? $users_list : array(), 'editable' => $this->user->hasProjectAccess('subtask', 'edit', $project['id']), + 'redirect' => 'task', )) ?> <?= $this->render('tasklink/show', array( diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php index b5a2c4b4..81cd3434 100644 --- a/app/Template/task/sidebar.php +++ b/app/Template/task/sidebar.php @@ -22,6 +22,18 @@ <?= $this->hook->render('template:task:sidebar:information') ?> </ul> + <h2><?= t('Sub-Tasks') ?></h2> + <ul> + <li <?= $this->app->checkMenuSelection('subtask', 'show') ?>> + <?= $this->url->link(t('View all sub-tasks'), 'subtask', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + </li> + <?php if ($this->user->hasProjectAccess('subtask', 'create', $task['project_id'])): ?> + <li <?= $this->app->checkMenuSelection('subtask', 'create') ?>> + <?= $this->url->link(t('Add a sub-task'), 'subtask', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + </li> + <?php endif ?> + </ul> + <h2><?= t('Links') ?></h2> <ul> <li <?= $this->app->checkMenuSelection('tasklink', 'show') ?>> @@ -52,9 +64,6 @@ <li <?= $this->app->checkMenuSelection('taskmodification', 'recurrence') ?>> <?= $this->url->link(t('Edit recurrence'), 'taskmodification', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </li> - <li <?= $this->app->checkMenuSelection('subtask', 'create') ?>> - <?= $this->url->link(t('Add a sub-task'), 'subtask', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> - </li> <li <?= $this->app->checkMenuSelection('comment', 'create') ?>> <?= $this->url->link(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </li> |