From 88ee691bb9c17bd6d2b93873ed789d2edc120b37 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 28 May 2016 17:26:33 -0400
Subject: Fix wrong redirect after removing a task from the task view page

---
 app/Template/task/dropdown.php |  2 +-
 app/Template/task/remove.php   | 15 ---------------
 app/Template/task/sidebar.php  |  2 +-
 3 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 app/Template/task/remove.php

(limited to 'app/Template/task')

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/remove.php b/app/Template/task/remove.php
deleted file mode 100644
index f963a325..00000000
--- a/app/Template/task/remove.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Remove a task') ?></h2>
-</div>
-
-<div class="confirm">
-    <p class="alert alert-info">
-        <?= t('Do you really want to remove this task: "%s"?', $this->text->e($task['title'])) ?>
-    </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') ?>
-        <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
-    </div>
-</div>
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 ?>
 
-- 
cgit v1.2.3