From 8a0881aef4c7e72a78929aa4cce5eadc89dd07b9 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Mon, 13 Dec 2021 10:14:50 +0800
Subject: [PATCH] *Finish task #45543.

---
 module/execution/view/testcase.html.php |  2 +-
 module/testcase/control.php             | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/module/execution/view/testcase.html.php b/module/execution/view/testcase.html.php
index 8864d62792..2de4640de5 100644
--- a/module/execution/view/testcase.html.php
+++ b/module/execution/view/testcase.html.php
@@ -64,7 +64,7 @@
                 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);
+                common::printIcon('testcase', 'edit',    "caseID=$caseID&comment=false&executionID=$executionID", $case, 'list', 'edit', '', '', '', '', '', $case->project);
             }
             ?>
           </td>
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 2d2c32c8af..225dbd0b6d 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -756,10 +756,12 @@ class testcase extends control
      * Edit a case.
      *
      * @param  int   $caseID
+     * @param  bool  $comment
+     * @param  int   $executionID
      * @access public
      * @return void
      */
-    public function edit($caseID, $comment = false)
+    public function edit($caseID, $comment = false, $executionID = 0)
     {
         $this->loadModel('story');
 
@@ -834,10 +836,17 @@ class testcase extends control
             $position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]);
 
             /* Set menu. */
-            if($this->app->tab == 'project' or $this->app->tab == 'execution') $this->loadModel('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);
+            if($this->app->tab == 'project' or $this->app->tab == 'execution')
+            {
+                $this->loadModel('execution');
+                if($this->app->tab == 'project') $this->loadModel('project')->setMenu($case->project);
+                if($this->app->tab == 'execution')
+                {
+                    if(!$executionID) $executionID = $case->execution;
+                    $this->execution->setMenu($executionID);
+                }
+            }
+            if($this->app->tab == 'qa') $this->testcase->setMenu($this->products, $productID, $case->branch);
 
             $moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $case->branch);
             if($case->lib and $case->fromCaseID)
@@ -855,7 +864,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' ? $case->project : $case->execution;
+                $objectID        = $this->app->tab == 'project' ? $case->project : $executionID;
                 $productBranches = (isset($product->type) and $product->type != 'normal') ? $this->execution->getBranchByProduct($productID, $objectID, 'all') : array();
                 $branches        = isset($productBranches[$productID]) ? $productBranches[$productID] : array();
             }