Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* finish task #983.

Browse Source
This commit is contained in:
wangyidong
2012-12-19 10:08:20 +00:00
parent 12d1bce624
commit d56cfd1da6
9 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
module/testtask/control.php
View File

@@ -230,7 +230,7 @@ class testtask extends control
{
$this->view->runs = $this->testtask->getUserRuns($taskID, $this->session->user->account, $orderBy, $pager);
}
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', 'false');
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);
/* Save testcaseIDs session for get the pre and next testcase. */
$testcaseIDs = '';
@@ -443,7 +443,19 @@ class testtask extends control
if(!$caseID) $run = $this->testtask->getRunById($runID);
if($caseID) $run->case = $this->loadModel('testcase')->getById($caseID, $version);
$this->view->run = $run;
$nextCase = '';
$caseID = $caseID ? $caseID : $run->case->id;
$preAndNext = $this->loadModel('common')->getPreAndNextObject('testcase', $caseID);
if($runID and $preAndNext->next) $preAndNext->next = $this->dao->select('*')->from(TABLE_TESTRUN)->where('`case`')->eq($preAndNext->next->id)->fetch();
if($preAndNext->next)
{
$nextCase['runID'] = $runID ? $preAndNext->next->id : 0;
$nextCase['caseID'] = $runID ? $preAndNext->next->case : $preAndNext->next->id;
$nextCase['version'] = $preAndNext->next->version;
}
$this->view->run = $run;
$this->view->nextCase = $nextCase;
die($this->display());
}