From 67dfccb01c69b0c016fa2b48a71e388c31b860a7 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 1 Sep 2021 09:31:55 +0800
Subject: [PATCH] * Fix bug #14776.

---
 module/bug/model.php                  | 2 ++
 module/testtask/view/results.html.php | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/bug/model.php b/module/bug/model.php
index f739fe39a8..07c5a885f4 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1823,6 +1823,8 @@ class bugModel extends model
         if(!empty($run->task)) $testtask = $this->loadModel('testtask')->getById($run->task);
         $executionID = isset($testtask->execution) ? $testtask->execution : 0;
 
+        if(!$executionID and $this->app->tab == 'execution') $executionID = $this->session->execution;
+
         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 8195769cae..73d95ad5ad 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -51,7 +51,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->tab == 'execution' and isset($testtask)) ? "executionID=$testtask->execution" : "";?>
+        <?php $executionParam = $this->app->tab == 'execution' ? "executionID={$this->session->execution}" : "";?>
+        <?php $executionParam = isset($testtask) ? "executionID=$testtask->execution" : $executionParam;?>
         <?php $params = isset($testtask) ? ",testtask=$testtask->id" : "";?>
         <?php $params = $params . ",buildID=" . (isset($testtask->build) ? $testtask->build : $result->build);?>
         <?php if($executionParam) $params .= ',' . $executionParam;?>