diff options
| -rw-r--r-- | app/Controller/Task.php | 6 | ||||
| -rw-r--r-- | app/Template/board/task.php | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/Controller/Task.php b/app/Controller/Task.php index c25a4b9d..205e480f 100644 --- a/app/Controller/Task.php +++ b/app/Controller/Task.php @@ -261,7 +261,11 @@ class Task extends Base $this->session->flashError(t('Unable to close this task.')); } - $this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'&project_id='.$task['project_id']); + if ($this->request->getStringParam('redirect') === 'board') { + $this->response->redirect($this->helper->url('board', 'show', array('project_id' => $task['project_id']))); + } + + $this->response->redirect($this->helper->url('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); } $this->response->html($this->taskLayout('task/close', array( diff --git a/app/Template/board/task.php b/app/Template/board/task.php index 546fbe1b..41c7ab45 100644 --- a/app/Template/board/task.php +++ b/app/Template/board/task.php @@ -46,6 +46,7 @@ <li><i class="fa fa-tag"></i> <?= $this->a(t('Change category'), 'board', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'category-popover') ?></li> <li><i class="fa fa-align-left"></i> <?= $this->a(t('Change description'), 'task', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-description-popover') ?></li> <li><i class="fa fa-pencil-square-o"></i> <?= $this->a(t('Edit this task'), 'task', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-edit-popover') ?></li> + <li><i class="fa fa-close"></i> <?= $this->a(t('Close this task'), 'task', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes', 'redirect' => 'board'), true) ?></li> </li> </li> </ul> |