From 0904f9ce6ff0beb0709a3b11e1827811ab31f489 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Sat, 29 Oct 2011 09:21:53 +0000
Subject: [PATCH] * fix bug#265

---
 module/testtask/control.php           | 14 ++++++++++++--
 module/testtask/view/results.html.php | 12 +++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index 1116728ba3..4a2ef48c88 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -368,8 +368,18 @@ class testtask extends control
 
         if(isset($caseID))
         {
-            $this->view->run->case = $this->loadModel('testcase')->getById($caseID, $version);
-            $this->view->results   = $this->testtask->getResults(0, $caseID);
+            $results = $this->testtask->getResults(0, $caseID);
+            foreach($results as $result)
+            {
+                $relatedVersions[] = $result->version;
+            }
+            $relatedVersions = array_unique($relatedVersions);
+
+            $run->case = $this->loadModel('testcase')->getById($caseID, 1);
+            $run->case->steps =  $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->eq($caseID)->andWhere('version')->in($relatedVersions)->fetchAll();
+
+            $this->view->results = $results;
+            $this->view->run     = $run;
         }
         else
         {
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 28cbd56c93..a28d873a18 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -26,7 +26,17 @@
     <th><?php echo $lang->testcase->result;?></th>
     <th class='w-p20'><?php echo $lang->testcase->real;?></th>
   </tr>
-  <?php foreach($run->case->steps as $key => $step):?>
+  <?php 
+  $relatedCaseSteps = array();
+  foreach($run->case->steps as $key => $step)
+  {
+    if($result->version == $step->version)
+    {
+        $relatedCaseSteps[] = $step;
+    }
+  }
+  foreach($relatedCaseSteps as $key => $step):
+  ?>
   <?php $stepResult = ''; if(!empty($result->stepResults)) $stepResult = (object)$result->stepResults[$step->id];?>
   <tr>
     <th><?php echo $key + 1;?></th>