From ce9ba610a2be161bb5901ba003d237d4a91f8ab4 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Wed, 18 Aug 2021 15:20:14 +0800
Subject: [PATCH] * Finish task #41487

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

diff --git a/module/bug/model.php b/module/bug/model.php
index e4ccfe217e..4cef62c809 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1817,8 +1817,11 @@ class bugModel extends model
             $bugSteps .= $this->lang->bug->tplResult;
             $bugSteps .= $this->lang->bug->tplExpect;
         }
+        
+        if(!empty($run->task)) $testtask = $this->loadModel('testtask')->getById($run->task);
+        $executionID = isset($testtask->execution) ? $testtask->execution : 0;
 
-        return array('title' => $title, 'steps' => $bugSteps, 'storyID' => $run->case->story, 'moduleID' => $run->case->module, 'version' => $run->case->version);
+        return array('title' => $title, 'steps' => $bugSteps, 'storyID' => $run->case->story, 'moduleID' => $run->case->module, 'version' => $run->case->version, 'executionID' => $executionID);
     }
 
     /**
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 8ba8c46c69..5611ea576a 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -51,12 +51,13 @@
           <td class='w-50px text-center'><i class='collapse-handle icon-angle-down text-muted'></i></td>
         </tr>
         <?php $executionParam = ($this->app->openApp == 'execution' and isset($testtask)) ? "executionID=$testtask->execution" : "";?>
-        <?php $params = isset($testtask) ? ",testtask=$testtask->id,buildID=$testtask->build" : "";?>
+        <?php $params = isset($testtask) ? ",testtask=$testtask->id" : "";?>
+        <?php $params = $params . ",buildID=" . (isset($testtask->build) ? $testtask->build : $result->build);?>
         <?php if($executionParam) $params .= ',' . $executionParam;?>
         <tr class='result-detail hide' id='tr-detail_<?php echo $trCount++; ?>'>
           <td colspan='7' class='pd-0'>
             <?php $projectParam = $this->app->openApp == 'project' ? "projectID={$this->session->project}," : ''?>
-            <form data-params='<?php echo "product=$case->product&branch=$case->branch&extras={$projectParam}caseID=$case->id,version=$case->version,resultID=$result->id,runID=$runID" . $params?>' method='post'>
+            <form data-params='<?php echo "product=$case->product&branch=$case->branch&extras={$projectParam}caseID=$case->id,version=$case->version,resultID=$result->id,runID=$result->run" . $params?>' method='post'>
               <table class='table table-condensed resultSteps'>
                 <thead>
                   <tr>