From 0cb2ea93a411de515b338a475b0321781a7ade38 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Thu, 17 May 2012 08:34:04 +0000
Subject: [PATCH]  * finish task#666.

---
 module/testtask/control.php           | 18 +++++++++++++-----
 module/testtask/view/results.html.php |  1 +
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index 5ded8cd9ad..ada83af44f 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -447,15 +447,23 @@ class testtask extends control
     {
         if($caseID)
         {
-            $this->view->case    = $this->loadModel('testcase')->getByID($caseID, $version);
-            $this->view->results = $this->testtask->getResults(0, $caseID);
+            $case    = $this->loadModel('testcase')->getByID($caseID, $version);
+            $results = $this->testtask->getResults(0, $caseID);
         }
         else
         {
-            $this->view->case    = $this->testtask->getRunById($runID)->case;
-            $this->view->results = $this->testtask->getResults($runID);
+            $case    = $this->testtask->getRunById($runID)->case;
+            $results = $this->testtask->getResults($runID);
+
+            $testtaskID = $this->dao->select('task')->from(TABLE_TESTRUN)->where('id')->eq($runID)->fetch('task', false);
+            $testtask   = $this->dao->select('build, product')->from(TABLE_TESTTASK)->where('id')->eq($testtaskID)->fetch();
+            $builds     = $this->loadModel('build')->getProductBuildPairs($testtask->product);
+            $this->view->build = isset($builds[$testtask->build]) ? $builds[$testtask->build] : '';
         }
-        $this->view->users       = $this->loadModel('user')->getPairs('noclosed, noletter');
+
+        $this->view->case    = $case;
+        $this->view->results = $results;
+        $this->view->users   = $this->loadModel('user')->getPairs('noclosed, noletter');
 
         die($this->display());
     }
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index c37f1619fd..9f3bf94e94 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -20,6 +20,7 @@
 <table class='table-1'>
   <caption>
     <div class='f-left'>RESULT#<?php echo $result->id . ' ' . $result->date . ' ' . $users[$result->lastRunner] . ' ' . $lang->testtask->runCase . ':'. " <span class='$result->caseResult'>" . $lang->testcase->resultList[$result->caseResult] . '</span>';?></div>
+    <?php if(isset($build)):?><div class='f-right'><?php echo $lang->testtask->build . $lang->colon . $build;?></div><?php endif;?>
   </caption>
   <tr>
     <th class='w-30px'><?php echo $lang->testcase->stepID;?></th>