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

* finish task #1140.

Browse Source
This commit is contained in:
wangyidong
2013-02-27 03:27:05 +00:00
parent 04fc7a1419
commit aac3545320
5 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+23 -5
View File
@@ -508,12 +508,23 @@ class testtask extends control
*/
public function runCase($runID, $caseID = 0, $version = 0)
{
$preAndNext = $this->loadModel('common')->getPreAndNextObject('testcase', $caseID);
if(!empty($_POST))
{
$this->testtask->createResult($runID);
if(dao::isError()) die(js::error(dao::getError()));
echo js::reload('parent');
die(js::closeWindow());
if($preAndNext->next)
{
$nextRunID = $runID ? $preAndNext->next->id : 0;
$nextCaseID = $runID ? $preAndNext->next->case : $preAndNext->next->id;
$nextVersion = $preAndNext->next->version;
die(js::locate(inlink('runCase', "runID=$nextRunID&caseID=$nextCaseID&version=$nextVersion")));
}
else
{
echo js::reload('parent');
die(js::closeWindow());
}
}
if(!$caseID) $run = $this->testtask->getRunById($runID);
@@ -523,10 +534,16 @@ class testtask extends control
$run->case = $this->loadModel('testcase')->getById($caseID, $version);
}
$nextCase = '';
$caseID = $caseID ? $caseID : $run->case->id;
$preAndNext = $this->loadModel('common')->getPreAndNextObject('testcase', $caseID);
$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;
$preCase['caseID'] = $runID ? $preAndNext->pre->case : $preAndNext->pre->id;
$preCase['version'] = $preAndNext->pre->version;
}
if($preAndNext->next)
{
$nextCase['runID'] = $runID ? $preAndNext->next->id : 0;
@@ -535,6 +552,7 @@ class testtask extends control
}
$this->view->run = $run;
$this->view->preCase = $preCase;
$this->view->nextCase = $nextCase;
die($this->display());