From 4b9c71fbf31625e61522876bb43d2d0861fd72f0 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 8 Jul 2013 01:24:35 +0000 Subject: [PATCH] * code for task #1441. --- module/testtask/control.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/module/testtask/control.php b/module/testtask/control.php index 2f281f490c..5f29ddec78 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -509,6 +509,17 @@ class testtask extends control */ public function runCase($runID, $caseID = 0, $version = 0) { + if($caseID) + { + $run = new stdclass(); + $run->case = $this->loadModel('testcase')->getById($caseID, $version); + } + else + { + $run = $this->testtask->getRunById($runID); + } + + $caseID = $caseID ? $caseID : $run->case->id; $preAndNext = $this->loadModel('common')->getPreAndNextObject('testcase', $caseID); if(!empty($_POST)) { @@ -528,16 +539,8 @@ class testtask extends control } } - if(!$caseID) $run = $this->testtask->getRunById($runID); - if($caseID) - { - $run = new stdclass(); - $run->case = $this->loadModel('testcase')->getById($caseID, $version); - } - $preCase = ''; $nextCase = ''; - $caseID = $caseID ? $caseID : $run->case->id; if($preAndNext->pre) { $preCase['runID'] = $runID ? $preAndNext->pre->id : 0;