Fix wrong redirect after removing a task from the task view page

6 files changed, 57 insertions, 34 deletions

diff --git a/app/Controller/TaskSuppressionController.php b/app/Controller/TaskSuppressionController.php
new file mode 100644
index 00000000..7c9165eb
--- /dev/null
+++ b/app/Controller/TaskSuppressionController.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Kanboard\Controller;
+
+use Kanboard\Core\Controller\AccessForbiddenException;
+
+/**
+ * Class TaskSuppressionController
+ *
+ * @package Kanboard\Controller
+ * @author  Frederic Guillot
+ */
+class TaskSuppressionController extends BaseController
+{
+    /**
+     * Confirmation dialog box before to remove the task
+     */
+    public function confirm()
+    {
+        $task = $this->getTask();
+
+        if (! $this->helper->user->canRemoveTask($task)) {
+            throw new AccessForbiddenException();
+        }
+
+        $this->response->html($this->template->render('task_suppression/remove', array(
+            'task' => $task,
+            'redirect' => $this->request->getStringParam('redirect'),
+        )));
+    }
+
+    /**
+     * Remove a task
+     */
+    public function remove()
+    {
+        $task = $this->getTask();
+        $this->checkCSRFParam();
+
+        if (! $this->helper->user->canRemoveTask($task)) {
+            throw new AccessForbiddenException();
+        }
+
+        if ($this->task->remove($task['id'])) {
+            $this->flash->success(t('Task removed successfully.'));
+        } else {
+            $this->flash->failure(t('Unable to remove this task.'));
+        }
+
+        $redirect = $this->request->getStringParam('redirect') === '';
+        $this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $task['project_id'])), $redirect);
+    }
+}
diff --git a/app/Controller/TaskViewController.php b/app/Controller/TaskViewController.php
index 6d3cc5c5..b16c15de 100644
--- a/app/Controller/TaskViewController.php
+++ b/app/Controller/TaskViewController.php
@@ -143,34 +143,4 @@ class TaskViewController extends BaseController
             'transitions' => $this->transition->getAllByTask($task['id']),
         )));
     }
-
-    /**
-     * Remove a task
-     *
-     * @access public
-     */
-    public function remove()
-    {
-        $task = $this->getTask();
-
-        if (! $this->helper->user->canRemoveTask($task)) {
-            throw new AccessForbiddenException();
-        }
-
-        if ($this->request->getStringParam('confirmation') === 'yes') {
-            $this->checkCSRFParam();
-
-            if ($this->task->remove($task['id'])) {
-                $this->flash->success(t('Task removed successfully.'));
-            } else {
-                $this->flash->failure(t('Unable to remove this task.'));
-            }
-
-            return $this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $task['project_id'])), true);
-        }
-
-        return $this->response->html($this->template->render('task/remove', array(
-            'task' => $task,
-        )));
-    }
 }
diff --git a/app/ServiceProvider/AuthenticationProvider.php b/app/ServiceProvider/AuthenticationProvider.php
index f8ea9b19..2fad8a3a 100644
--- a/app/ServiceProvider/AuthenticationProvider.php
+++ b/app/ServiceProvider/AuthenticationProvider.php
@@ -92,7 +92,7 @@ class AuthenticationProvider implements ServiceProviderInterface
         $acl->add('SubtaskRestrictionController', '*', Role::PROJECT_MEMBER);
         $acl->add('SubtaskStatusController', '*', Role::PROJECT_MEMBER);
         $acl->add('SwimlaneController', '*', Role::PROJECT_MANAGER);
-        $acl->add('TaskViewController', 'remove', Role::PROJECT_MEMBER);
+        $acl->add('TaskSuppressionController', '*', Role::PROJECT_MEMBER);
         $acl->add('TaskCreationController', '*', Role::PROJECT_MEMBER);
         $acl->add('TaskBulkController', '*', Role::PROJECT_MEMBER);
         $acl->add('TaskDuplicationController', '*', Role::PROJECT_MEMBER);
diff --git a/app/Template/task/dropdown.php b/app/Template/task/dropdown.php
index 472c819f..b6b9c789 100644
--- a/app/Template/task/dropdown.php
+++ b/app/Template/task/dropdown.php
@@ -58,7 +58,7 @@
         <?php if ($this->user->canRemoveTask($task)): ?>
             <li>
                 <i class="fa fa-trash-o fa-fw"></i>
-                <?= $this->url->link(t('Remove'), 'TaskViewController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+                <?= $this->url->link(t('Remove'), 'TaskSuppressionController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
             </li>
         <?php endif ?>
         <?php if (isset($task['is_active'])): ?>
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index ff3883e1..e77ec18a 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -90,7 +90,7 @@
         <?php if ($this->user->canRemoveTask($task)): ?>
             <li>
                 <i class="fa fa-trash-o fa-fw"></i>
-                <?= $this->url->link(t('Remove'), 'TaskViewController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+                <?= $this->url->link(t('Remove'), 'TaskSuppressionController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => 'board'), false, 'popover') ?>
             </li>
         <?php endif ?>
 
diff --git a/app/Template/task/remove.php b/app/Template/task_suppression/remove.php
index f963a325..5d0f7720 100644
--- a/app/Template/task/remove.php
+++ b/app/Template/task_suppression/remove.php
@@ -8,7 +8,7 @@
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'TaskViewController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red popover-link') ?>
+        <?= $this->url->link(t('Yes'), 'TaskSuppressionController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => $redirect), true, 'btn btn-red popover-link') ?>
         <?= t('or') ?>
         <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>