* finish task #1163.

This commit is contained in:
wangyidong
2013-03-13 02:05:08 +00:00
parent a2616f7ca3
commit 4962843783
3 changed files with 34 additions and 54 deletions
+2 -3
View File
@@ -538,7 +538,6 @@ class testtask extends control
$preCase = '';
$nextCase = '';
$caseID = $caseID ? $caseID : $run->case->id;
if($runID and $preAndNext->next) $preAndNext->next = $this->dao->select('*')->from(TABLE_TESTRUN)->where('`case`')->eq($preAndNext->next->id)->fetch();
if($preAndNext->pre)
{
$preCase['runID'] = $runID ? $preAndNext->pre->id : 0;
@@ -585,8 +584,8 @@ class testtask extends control
else
{
$this->testtask->batchRun($from);
$method = $from == 'testcase' ? 'browse' : 'cases';
die(js::locate($this->createLink($from, $method, "productID=$productID"), 'parent'));
$url = $this->session->caseList ? $this->session->caseList : $this->createLink('testcase', 'browse', "productID=$productID");
die(js::locate($url, 'parent'));
}
$this->app->loadLang('testcase');
$this->testtask->setMenu($this->products, $productID);