From f94685f6fb7f58758d46a80c31ef883640ae2f28 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Mon, 16 Oct 2023 22:16:27 -0400
Subject: [PATCH] * Fix bug #39500,39464,39447.

---
 module/execution/control.php         | 2 +-
 module/project/control.php           | 5 +++++
 module/testtask/view/create.html.php | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index a3d1e75d02..1ea98145fb 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -3425,7 +3425,7 @@ class execution extends control
         $object     = $this->project->getByID($objectID, 'project,sprint,stage,kanban');
         $products   = $this->product->getProducts($objectID);
         $queryID    = ($browseType == 'bySearch') ? (int)$param : 0;
-        $browseLink = $this->session->executionStoryList ? $this->session->executionStoryList : $this->createLink('execution', 'story', "executionID=$objectID");
+        $browseLink = $this->createLink('execution', 'story', "executionID=$objectID");
         if($this->app->tab == 'project' and $object->multiple and !$browseLink) $browseLink = $this->createLink('projectstory', 'story', "objectID=$objectID&productID=0&branch=0&browseType=&param=0&storyType=$storyType");
         if($object->type == 'kanban' && !$object->hasProduct) $this->lang->productCommon = $this->lang->project->common;
 
diff --git a/module/project/control.php b/module/project/control.php
index 2750d41288..69bca3993a 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1096,6 +1096,11 @@ class project extends control
         $this->project->setMenu($projectID);
 
         if(!$projectID) return print(js::locate($this->createLink('project', 'browse')));
+        if(!$project->multiple)
+        {
+            $executionID = $this->execution->getNoMultipleID($projectID);
+            return print(js::locate($this->createLink('execution', 'task', "executionID=$executionID")));
+        }
         if(!empty($project->model) and $project->model == 'kanban' and !(defined('RUN_MODE') and RUN_MODE == 'api')) return print(js::locate($this->createLink('project', 'index', "projectID=$projectID")));
 
         /* Load pager and get tasks. */
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index 8fff503546..2360aecfa9 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -36,7 +36,9 @@
         <?php endif;?>
 
         <?php if(isset($noMultipleExecutionID)):?>
+        <tr class='hide'>
         <?php echo html::hidden('execution', $noMultipleExecutionID);?>
+        </tr>
         <?php else:?>
         <tr class='<?php echo ($app->tab == 'execution' and $executionID) ? 'hide' : '';?>'>
           <th class='w-100px'><?php echo $lang->testtask->execution;?></th>