From f2b60bda9e1abecab45d79ac4137300fbafcd3fb Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Sat, 27 Nov 2021 19:17:38 +0800
Subject: [PATCH] * Finish task #45011.

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

diff --git a/module/testtask/control.php b/module/testtask/control.php
index 70fd5cd2d3..51a7740d02 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -1229,6 +1229,7 @@ class testtask extends control
      */
     public function batchRun($productID, $orderBy = 'id_desc', $from = 'testcase', $taskID = 0)
     {
+        $this->loadModel('tree');
         $url = $this->session->caseList ? $this->session->caseList : $this->createLink('testcase', 'browse', "productID=$productID");
         if($this->post->results)
         {
@@ -1256,7 +1257,7 @@ class testtask extends control
             {
                 $this->loadModel('qa')->setMenu($this->products, $productID, $taskID);
             }
-            $this->view->moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, 'all');
+            $this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, 'case', 0, 'all');
 
             $cases = $this->dao->select('*')->from(TABLE_CASE)->where('id')->in($caseIDList)->fetchAll('id');
         }
diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php
index bc99558c5b..75335c475a 100644
--- a/module/testtask/view/batchrun.html.php
+++ b/module/testtask/view/batchrun.html.php
@@ -28,13 +28,14 @@
           <th><?php echo $lang->testcase->stepDesc . '/' . $lang->testcase->stepExpect?></th>
         </tr>
       </thead>
+      <?php $moduleOptionMenu = $productID ? $moduleOptionMenu : array();?>
       <?php foreach($cases as $caseID => $case):?>
       <?php if($case->status == 'wait') continue;?>
       <?php
       if(!$productID)
       {
           echo html::hidden("caseIDList[$case->id]", $caseID);
-          $moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($case->product, $viewType = 'case', $startModuleID = 0);
+          if(!isset($moduleOptionMenu[$case->module])) $moduleOptionMenu += $this->tree->getOptionMenu($case->product, 'case', 0, $case->branch);
       }
        ?>
       <tr class='text-center'>