From 3d09288ecaa72f09f3f9bd738e73791292829ec3 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 19 Nov 2021 15:33:19 +0800
Subject: [PATCH] * Modify the code.

---
 module/testcase/control.php          | 12 +++++++-----
 module/testcase/view/create.html.php |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index 2a1d4f2f12..1acfb49869 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -299,8 +299,9 @@ class testcase extends control
      */
     public function create($productID, $branch = '', $moduleID = 0, $from = '', $param = 0, $storyID = 0, $extras = '')
     {
-        $testcaseID = ($from and strpos('testcase|work|contribute', $from) !== false) ? $param : 0;
-        $bugID      = $from == 'bug' ? $param : 0;
+        $testcaseID  = ($from and strpos('testcase|work|contribute', $from) !== false) ? $param : 0;
+        $bugID       = $from == 'bug' ? $param : 0;
+        $executionID = $from == 'execution' ? $param : 0;
 
         $extras = str_replace(array(',', ' '), array('&', ''), $extras);
         parse_str($extras, $output);
@@ -471,6 +472,7 @@ class testcase extends control
         $this->view->position         = $position;
         $this->view->projectID        = isset($projectID) ? $projectID : 0;
         $this->view->productID        = $productID;
+        $this->view->executionID      = $executionID;
         $this->view->productName      = $this->products[$productID];
         $this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $branch === 'all' ? 0 : $branch);
         $this->view->currentModuleID  = $currentModuleID;
@@ -805,8 +807,8 @@ class testcase extends control
 
             /* Set menu. */
             if($this->app->tab == 'project' or $this->app->tab == 'execution') $this->loadModel('execution');
-            if($this->app->tab == 'project')   $this->loadModel('project')->setMenu($this->session->project);
-            if($this->app->tab == 'execution') $this->execution->setMenu($this->session->execution);
+            if($this->app->tab == 'project')   $this->loadModel('project')->setMenu($case->project);
+            if($this->app->tab == 'execution') $this->execution->setMenu($case->execution);
             if($this->app->tab == 'qa')        $this->testcase->setMenu($this->products, $productID, $case->branch);
 
             $moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $case->branch);
@@ -825,7 +827,7 @@ class testcase extends control
             $product = $this->product->getById($productID);
             if($this->app->tab == 'execution' or $this->app->tab == 'project')
             {
-                $objectID = $this->app->tab == 'project' ? $this->session->project : $this->session->execution;
+                $objectID        = $this->app->tab == 'project' ? $case->project : $case->execution;
                 $productBranches = (isset($product->type) and $product->type != 'normal') ? $this->execution->getBranchByProduct($productID, $objectID) : array();
                 $branches        = isset($productBranches[$productID]) ? $productBranches[$productID] : array();
             }
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 1670368904..8f0cbbb642 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -18,8 +18,8 @@
 <?php js::set('isonlybody', isonlybody());?>
 <?php js::set('executionID', $projectID);?>
 <?php js::set('tab', $this->app->tab);?>
-<?php if($this->app->tab == 'execution') js::set('objectID', $this->session->execution);?>
-<?php if($this->app->tab == 'project') js::set('objectID', $this->session->project);?>
+<?php if($this->app->tab == 'execution') js::set('objectID', $executionID);?>
+<?php if($this->app->tab == 'project') js::set('objectID', $projectID);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>