From f937a6ac8f3ae6ab4157d1627f6dbd20ff3063c8 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 1 Mar 2022 15:22:07 +0800
Subject: [PATCH] * Fix bug of batch edit test case.

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

diff --git a/module/testcase/control.php b/module/testcase/control.php
index 6e66755cbd..cd007b2935 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -978,7 +978,7 @@ class testcase extends control
                 /* Set branches and modules. */
                 $branches        = array();
                 $branchTagOption = array();
-                $modules  = array();
+                $modules         = array();
                 if($product->type != 'normal')
                 {
                     $branches = $this->loadModel('branch')->getList($productID, 0, 'all');
diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php
index 61df4b4a53..052fcaf0e3 100644
--- a/module/testcase/view/batchedit.html.php
+++ b/module/testcase/view/batchedit.html.php
@@ -86,8 +86,9 @@
             <?php if($branchProduct):?>
             <td class='text-left' style='overflow:visible'>
               <?php $branchProductID = $productID ? $productID : $cases[$caseID]->product;?>
-              <?php $disabled        = $products[$branchProductID]->type != 'normal' ? '' : "disabled='disabled'";?>
-              <?php echo html::select("branches[$caseID]", !empty($disabled) ? array() : $branchTagOption[$branchProductID], $products[$branchProductID]->type != 'normal' ? $cases[$caseID]->branch : '', "class='form-control chosen' onchange='loadBranches($branchProductID, this.value, $caseID)', $disabled");?>
+              <?php $productType     = $productID ? $product->type : $products[$branchProductID]->type;?>
+              <?php $disabled        = $productType != 'normal' ? '' : "disabled='disabled'";?>
+              <?php echo html::select("branches[$caseID]", !empty($disabled) ? array() : $branchTagOption[$branchProductID], $productType != 'normal' ? $cases[$caseID]->branch : '', "class='form-control chosen' onchange='loadBranches($branchProductID, this.value, $caseID)', $disabled");?>
             </td>
             <?php endif;?>
             <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$caseID]", zget($modulePairs, $caseID, array(0 => '/')), $cases[$caseID]->module, "class='form-control chosen' onchange='loadStories($productID, this.value, $caseID)'");?></td>