From 02106b474710444cb02f87859c8f0dee8c8bd077 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 26 Sep 2015 15:03:15 -0400
Subject: Show "Open this task" in dropdown menu for closed tasks

---
 app/Template/task_status/close.php | 2 +-
 app/Template/task_status/open.php  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/Template/task_status')

diff --git a/app/Template/task_status/close.php b/app/Template/task_status/close.php
index 4de3dcb2..d32863bd 100644
--- a/app/Template/task_status/close.php
+++ b/app/Template/task_status/close.php
@@ -4,7 +4,7 @@
 
 <div class="confirm">
     <p class="alert alert-info">
-        <?= t('Do you really want to close the task "%s" as well as all subtasks?', $this->e($task['title'])) ?>
+        <?= t('Do you really want to close the task "%s" as well as all subtasks?', $task['title']) ?>
     </p>
 
     <div class="form-actions">
diff --git a/app/Template/task_status/open.php b/app/Template/task_status/open.php
index 0043fdae..615b2464 100644
--- a/app/Template/task_status/open.php
+++ b/app/Template/task_status/open.php
@@ -4,12 +4,12 @@
 
 <div class="confirm">
     <p class="alert alert-info">
-        <?= t('Do you really want to open this task: "%s"?', $this->e($task['title'])) ?>
+        <?= t('Do you really want to open this task: "%s"?', $task['title']) ?>
     </p>
 
     <div class="form-actions">
-        <?= $this->url->link(t('Yes'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?>
+        <?= $this->url->link(t('Yes'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes', 'redirect' => $redirect), true, 'btn btn-red') ?>
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
     </div>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3