From 57e90b8dbc6a3aaa1edeb4ad7f6fa09c47ae90af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Fri, 22 Apr 2022 14:42:22 +0800
Subject: [PATCH] * Fix bug for qiqi.

---
 module/bug/js/common.js                   |  2 +-
 module/testcase/view/batchcreate.html.php | 26 ++++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 426c6c0f23..dd099838b8 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -270,7 +270,7 @@ function loadProductExecutions(productID, projectID = 0)
     {
         $(this).find('select').chosen();
         if(typeof(bugExecution) == 'string' && systemMode != 'classic') $('#executionIdBox').prepend("<span class='input-group-addon' id='executionBox' style='border-left-width: 0px;'>" + bugExecution + "</span>");
-        if(required) $(this).addClass('required');
+        if(required) $(this).find('#execution_chosen').addClass('required');
         if(page != 'edit') changeAssignedTo(projectID);
     });
 
diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php
index e984483cdc..a9102056f6 100644
--- a/module/testcase/view/batchcreate.html.php
+++ b/module/testcase/view/batchcreate.html.php
@@ -65,7 +65,11 @@
             <th class='c-review<?php  echo zget($visibleFields, 'review', ' hidden') . zget($requiredFields, 'review', '', ' required')?>'><?php echo $lang->testcase->review;?></th>
             <?php
             $extendFields = $this->testcase->getFlowExtendFields();
-            foreach($extendFields as $extendField) echo "<th class='c-extend'>{$extendField->name}</th>";
+            foreach($extendFields as $extendField) 
+            {   
+                $required = strpos(",$extendField->rules,", ',1,') !== false ? 'required' : ''; 
+                echo "<th class='c-extend $required'>{$extendField->name}</th>";
+            }   
             ?>
           </tr>
         </thead>
@@ -102,7 +106,15 @@
             <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[$i]", '', "class='form-control'");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stage[$i][]", $lang->testcase->stageList, '', "class='form-control chosen' multiple");?></td>
             <td class='<?php echo zget($visibleFields, 'review', 'hidden')?>'><?php echo html::select("needReview[$i]", $lang->testcase->reviewList, $needReview, "class='form-control'");?></td>
-            <?php foreach($extendFields as $extendField) echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, '', $extendField->field . "[$i]") . "</td>";?>
+            <?php
+            $this->loadModel('flow');
+            foreach($extendFields as $extendField)
+            {
+                $object = new stdclass();
+                $object->{$extendField->field} = $extendField->default;
+                echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->flow->getFieldControl($extendField, $object, $extendField->field . "[$i]") . "</td>";
+            }
+            ?>
           </tr>
           <?php endfor;?>
         </tbody>
@@ -143,7 +155,15 @@
       <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[%s]", '', "class='form-control'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stage[%s][]", $lang->testcase->stageList, '', "class='form-control chosen' multiple");?></td>
       <td class='<?php echo zget($visibleFields, 'review', 'hidden')?>'><?php echo html::select("needReview[%s]", $lang->testcase->reviewList, $needReview, "class='form-control chosen'");?></td>
-      <?php foreach($extendFields as $extendField) echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, '', $extendField->field . "[%s]") . "</td>";?>
+      <?php 
+      $this->loadModel('flow');
+      foreach($extendFields as $extendField) 
+      {   
+          $object = new stdclass();
+          $object->{$extendField->field} = $extendField->default;
+          echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->flow->getFieldControl($extendField, $object, $extendField->field . "[%s]") . "</td>";
+      }   
+      ?>
     </tr>
   </tbody>
 </table>