From d66c7260328aa75cce67eaa9c0c8bd02f794d5f3 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 10 May 2021 13:59:08 +0800
Subject: [PATCH] * Fix bug#12497.

---
 module/execution/control.php            | 2 +-
 module/execution/view/testcase.html.php | 4 ++--
 module/testtask/view/results.html.php   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index b58a073bba..b405dfdaa6 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -936,7 +936,7 @@ class execution extends control
         $cases = $this->loadModel('testcase')->getExecutionCases($executionID, $orderBy, $pager, $type);
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);
 
-        $cases = $this->testcase->appendData($cases, 'run');
+        $cases = $this->testcase->appendData($cases, 'case');
 
         $this->view->title       = $this->lang->execution->testcase;
         $this->view->executionID = $executionID;
diff --git a/module/execution/view/testcase.html.php b/module/execution/view/testcase.html.php
index b3ef464618..76228dcd54 100644
--- a/module/execution/view/testcase.html.php
+++ b/module/execution/view/testcase.html.php
@@ -60,14 +60,14 @@
             <?php
             if($canBeChanged)
             {
-                common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug', '', '', '', '', '', $case->project);
+                common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID,executionID=$executionID", $case, 'list', 'bug', '', 'iframe', '', "data-width='90%'", '', $case->project);
                 common::printIcon('testcase', 'create',  "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$caseID", $case, 'list', 'copy', '', '', '', '', '', $case->project);
                 common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$caseID&version=$case->version", '', 'list', 'play', '', 'iframe', true, "data-width='95%'", '', $case->project);
                 common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', true, "data-width='95%'", '', $case->project);
                 common::printIcon('testcase', 'edit',    "caseID=$caseID", $case, 'list', 'edit', '', '', '', '', '', $case->project);
             }
             ?>
-          </td> 
+          </td>
         </tr>
         <?php endforeach;?>
       </tbody>
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 9b072475e0..417c76c810 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -50,8 +50,8 @@
           <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-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,{$executionParam}buildID=$testtask->build" : '';?>
+        <?php $executionParam = ($this->app->openApp == 'execution' and isset($testtask)) ? "executionID=$testtask->execution," : "executionID={$this->session->execution}";?>
+        <?php $params = isset($testtask) ? ",testtask=$testtask->id,{$executionParam}buildID=$testtask->build" : ",$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}," : ''?>