From bc391577bae51223ceb483434bae8dfff955805c Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 3 Nov 2014 08:35:17 +0000 Subject: [PATCH] * fix a bug. --- module/bug/control.php | 4 +++- module/task/control.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/module/bug/control.php b/module/bug/control.php index c06faa5778..448a6aba0d 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -771,7 +771,9 @@ class bug extends control if($bug->toTask != 0) { $confirmURL = $this->createLink('task', 'view', "taskID=$bug->toTask"); - echo js::confirm(sprintf($this->lang->bug->remindTask, $bug->toTask), $confirmURL, '', 'parent'); + unset($_GET['onlybody']); + $cancelURL = $this->createLink('bug', 'view', "bugID=$bugID"); + die(js::confirm(sprintf($this->lang->bug->remindTask, $bug->toTask), $confirmURL, $cancelURL, 'parent', 'parent.parent')); } if(isonlybody()) die(js::closeModal('parent.parent')); die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent')); diff --git a/module/task/control.php b/module/task/control.php index 6b9e47c7a1..4a8b32cbe9 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -621,7 +621,9 @@ class task extends control if($change['field'] == 'status') { $confirmURL = $this->createLink('bug', 'view', "id=$task->fromBug"); - echo js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, '', 'parent'); + unset($_GET['onlybody']); + $cancelURL = $this->createLink('task', 'view', "taskID=$taskID"); + die(js::confirm(sprintf($this->lang->task->remindBug, $task->fromBug), $confirmURL, $cancelURL, 'parent', 'parent.parent')); } } }