From a453c5fdef7f286cea037845d4aa254e98fe1ea9 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Tue, 2 May 2017 10:50:28 +0800
Subject: [PATCH]  * finish task #3017.

---
 module/bug/js/common.js               | 2 +-
 module/testtask/control.php           | 5 ++---
 module/testtask/view/results.html.php | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 4a2d943243..7734e9f505 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -9,7 +9,7 @@ $(function()
         moduleID   = $('#module').val();
         assignedto = $('#assignedTo').val();
         changeProductConfirmed = true;
-        oldStoryID             = 0;
+        oldStoryID             = $('#story').val() || 0;
         oldProjectID           = 0;
         oldOpenedBuild         = '';
         oldTaskID              = 0;
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 385d18573e..0aa4ab1550 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -919,10 +919,9 @@ class testtask extends control
             $results = $this->testtask->getResults($runID);
 
             $testtaskID = $this->dao->select('task')->from(TABLE_TESTRUN)->where('id')->eq($runID)->fetch('task');
-            $testtask   = $this->dao->select('build, product')->from(TABLE_TESTTASK)->where('id')->eq($testtaskID)->fetch();
+            $testtask   = $this->dao->select('build, project, product')->from(TABLE_TESTTASK)->where('id')->eq($testtaskID)->fetch();
 
-            $this->view->build      = isset($builds[$testtask->build]) ? $builds[$testtask->build] : '';
-            $this->view->testtaskID = $testtaskID;
+            $this->view->testtask = $testtask;
         }
         else
         {
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 0628aeeede..e760c6bc2a 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -47,9 +47,10 @@
           <td class='w-60px'><?php if(!empty($result->files)) echo html::a("#caseResult{$result->id}", $lang->files . $fileCount, '', "data-toggle='modal' data-type='iframe'")?></td>
           <td class='w-50px text-center'><i class='collapse-handle icon-chevron-down text-muted'></i></td>
         </tr>
+        <?php $params = isset($testtask) ? "testtask=$testtask->id,projectID=$testtask->project,buildID=$testtask->build" : '';?>
         <tr class='result-detail hide' id='tr-detail_<?php echo $trCount++; ?>'>
           <td colspan='7' class='pd-0'>
-            <form action='<?php echo $this->createLink('bug', 'create', "product=$case->product&branch=$case->branch&extras=caseID=$case->id,version=$case->version,resultID=$result->id,runID=$runID" . (isset($testtaskID) ? ",testtask=$testtaskID" : ''))?>' target='_blank' method='post'>
+            <form action='<?php echo $this->createLink('bug', 'create', "product=$case->product&branch=$case->branch&extras=caseID=$case->id,version=$case->version,resultID=$result->id,runID=$runID" . $params)?>' target='_blank' method='post'>
             <table class='table table-condensed borderless mg-0 resultSteps'>
               <thead>
                 <tr>