From f249c8674d056d22815a9324599156bc6038f905 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 29 Jul 2014 01:47:42 +0000
Subject: [PATCH]  * finish task #1950.

---
 module/bug/model.php               |  5 +++++
 module/testtask/view/view.html.php | 11 ++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/module/bug/model.php b/module/bug/model.php
index 564953b8d8..1cfeee80e3 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -468,6 +468,11 @@ class bugModel extends model
             ->remove('comment')
             ->get();
 
+        if($bug->resolvedBuild != 'trunk')
+        {
+            $bug->testtask = $this->dao->select('id')->from(TABLE_TESTTASK)->where('build')->eq($bug->resolvedBuild)->orderBy('id_desc')->limit(1)->fetch('id');
+        }
+
         $this->dao->update(TABLE_BUG)->data($bug)
             ->autoCheck()
             ->batchCheck($this->config->bug->resolve->requiredFields, 'notempty')
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index 99c7ec01ce..5505a1f1d7 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -40,13 +40,14 @@
         common::printIcon('testtask', 'delete',   "taskID=$task->id", '', 'button', '', 'hiddenwin');
         echo '</div>';
 
+        echo "<div class='btn-group'>";
+        common::printRPN($browseLink);
+        echo '</div>';
+
         $actionLinks = ob_get_contents();
         ob_clean();
         echo $actionLinks;
     }
-    echo "<div class='btn-group'>";
-    common::printRPN($browseLink);
-    echo '</div>';
     ?>
   </div>
 </div>
@@ -98,10 +99,6 @@
             <th><?php echo $lang->testtask->status;?></th>
             <td><?php echo $lang->testtask->statusList[$task->status];?></td>
           </tr>  
-          <tr>
-            <th><?php echo $lang->testtask->report;?></th>
-            <td class='content'><?php echo $task->report;?></td>
-          </tr>  
        </table>
       </fieldset>
     </div>