From 03dc6303ad2ab180d3413eb117d3c4f567ad538f Mon Sep 17 00:00:00 2001
From: wyd621 <wyd621@163.com>
Date: Thu, 26 Sep 2013 02:54:40 +0000
Subject: [PATCH]  * fix a bug #498.

---
 module/testtask/control.php         | 7 +++++--
 module/testtask/js/cases.js         | 2 +-
 module/testtask/view/cases.html.php | 2 +-
 module/todo/control.php             | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index 5ffcc3319d..ef18842828 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -613,6 +613,10 @@ class testtask extends control
         {
             $this->testtask->createResult($runID);
             if(dao::isError()) die(js::error(dao::getError()));
+
+            /* set cookie for ajax load caselist when close colorbox. */
+            setcookie('selfClose', 1);
+
             if($preAndNext->next)
             {
                 $nextRunID   = $runID ? $preAndNext->next->id : 0;
@@ -622,8 +626,7 @@ class testtask extends control
             }
             else
             {
-                echo js::reload('parent');
-                die(js::closeWindow());
+                die(js::closeColorbox('parent'));
             }
         }
 
diff --git a/module/testtask/js/cases.js b/module/testtask/js/cases.js
index de106f2099..58286a7c41 100644
--- a/module/testtask/js/cases.js
+++ b/module/testtask/js/cases.js
@@ -28,7 +28,7 @@ $(document).ready(function()
 
 $(document).ready(function()
 {
-    $("a.iframe").colorbox({width:900, height:550, iframe:true, transition:'none', onCleanup:function(){parent.location.href=parent.location.href;}});
+    $("a.iframe").colorbox({width:900, height:550, iframe:true, transition:'none'});
     $('#' + browseType + 'Tab').addClass('active');
     $('#module' + moduleID).addClass('active'); 
 });
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index c4b63c881e..85e846f07d 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -88,7 +88,7 @@ var moduleID   = '<?php echo $moduleID;?>';
             <td class='<?php echo $run->status;?>'><?php echo ($run->version < $run->caseVersion) ? "<span class='warning'>{$lang->testcase->changed}</span>" : $lang->testtask->statusList[$run->status];?></td>
             <td class='a-center'>
               <?php
-              common::printIcon('testtask', 'runCase',    "id=$run->id", '', 'list', '', '', 'iframe');
+              common::printIcon('testtask', 'runCase',    "id=$run->id", '', 'list', '', '', 'runCase');
               common::printIcon('testtask', 'results',    "id=$run->id", '', 'list', '', '', 'iframe');
 
               $unlinkURL = $this->createLink('testtask', 'unlinkCase', "caseID=$run->id&confirm=yes");
diff --git a/module/todo/control.php b/module/todo/control.php
index c6ced3db44..9fc2f1623f 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -312,6 +312,7 @@ class todo extends control
             $cancelURL   = $this->server->HTTP_REFERER;
             die(js::confirm(sprintf($this->lang->todo->$confirmNote, $todo->idvalue), $confirmURL, $cancelURL, 'parent', 'parent'));
         }
+        if(isonlybody())die(js::reload('parent.parent'));
         die(js::reload('parent'));
     }