From 2ba474e4a4ad75912f46884e07349cdb2ea7c603 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Mon, 6 Feb 2023 02:37:22 +0000
Subject: [PATCH] * Adjust Ticket 330.

---
 module/caselib/view/batchcreatecase.html.php | 8 ++++----
 module/caselib/view/createcase.html.php      | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/module/caselib/view/batchcreatecase.html.php b/module/caselib/view/batchcreatecase.html.php
index d1d8a5cbb8..a644451b5b 100644
--- a/module/caselib/view/batchcreatecase.html.php
+++ b/module/caselib/view/batchcreatecase.html.php
@@ -28,10 +28,10 @@
           <th class='c-module<?php echo strpos($config->testcase->create->requiredFields, 'module') ? ' required' : '';?>'><?php echo $lang->testcase->module;?></th>
           <th class='required'><?php echo $lang->testcase->title;?></th>
           <th class='c-status required'><?php echo $lang->testcase->type;?></th>
-          <th class='c-status'><?php echo $lang->testcase->pri;?></th>
-          <th class='c-text'><?php echo $lang->testcase->precondition;?></th>
-          <th class='c-text'><?php echo $lang->testcase->keywords;?></th>
-          <th class='c-text'><?php echo $lang->testcase->stage;?></th>
+          <th class='c-status<?php  echo strpos($config->testcase->create->requiredFields, 'pri') ? ' required' : '';?>'><?php echo $lang->testcase->pri;?></th>
+          <th class='c-text<?php  echo strpos($config->testcase->create->requiredFields, 'precondition') ? ' required' : '';?>'><?php echo $lang->testcase->precondition;?></th>
+          <th class='c-text<?php  echo strpos($config->testcase->create->requiredFields, 'keywords') ? ' required' : '';?>'><?php echo $lang->testcase->keywords;?></th>
+          <th class='c-text<?php  echo strpos($config->testcase->create->requiredFields, 'stage') ? ' required' : '';?>'><?php echo $lang->testcase->stage;?></th>
         </tr>
       </thead>
       <tbody>
diff --git a/module/caselib/view/createcase.html.php b/module/caselib/view/createcase.html.php
index 1dcaed2fc1..9e8f5ada7b 100644
--- a/module/caselib/view/createcase.html.php
+++ b/module/caselib/view/createcase.html.php
@@ -55,7 +55,7 @@
             <th><?php echo $lang->testcase->type;?></th>
             <td><?php echo html::select('type', $lang->testcase->typeList, $type, "class='form-control chosen'");?></td>
             <?php if(strpos(",$showFields,", 'stage') !== false):?>
-            <td style='padding-left:15px'>
+            <td style='padding-left:15px'<?php echo strpos($config->testcase->create->requiredFields, 'stage') ? ' class="required"' : '';?>>
               <div class='input-group'>
                 <span class='input-group-addon w-80px'><?php echo $lang->testcase->stage?></span>
                 <?php echo html::select('stage[]', $lang->testcase->stageList, $stage, "class='form-control chosen' multiple='multiple'");?>
@@ -101,11 +101,12 @@
                 <?php echo html::select('pri', (array)$priList, $pri, "class='form-control'");?>
                 <?php else: ?>
                 <?php ksort($priList);?>
+                <?php $priClass = strpos($config->testcase->create->requiredFields, 'pri') ? 'required' : '';?>
                 <div class="input-group-btn pri-selector" data-type="pri">
                   <button type="button" class="btn dropdown-toggle br-0" data-toggle="dropdown">
                     <span class="pri-text"><span class="label-pri label-pri-<?php echo empty($pri) ? '0' : $pri?>" title="<?php echo $pri?>"><?php echo $pri?></span></span> &nbsp;<span class="caret"></span>
                   </button>
-                  <div class='dropdown-menu pull-right'>
+                  <div class='dropdown-menu pull-right <?php echo $priClass?>'>
                     <?php echo html::select('pri', (array)$priList, $pri, "class='form-control' data-provide='labelSelector' data-label-class='label-pri'");?>
                   </div>
                 </div>
@@ -116,7 +117,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->testcase->precondition;?></th>
-            <td colspan='2'><?php echo html::textarea('precondition', $precondition, " rows='2' class='form-control'");?></td>
+            <td colspan='2' <?php echo strpos($config->testcase->create->requiredFields, 'precondition') ? ' class="required"' : '';?>><?php echo html::textarea('precondition', $precondition, " rows='2' class='form-control'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->testcase->steps;?></th>
@@ -189,7 +190,7 @@
           <?php if(strpos(",$showFields,", ',keywords,') !== false):?>
           <tr>
             <th><?php echo $lang->testcase->keywords;?></th>
-            <td colspan='2'><?php echo html::input('keywords', '', "class='form-control'");?></td>
+            <td colspan='2' <?php echo strpos($config->testcase->create->requiredFields, 'keywords') ? ' class="required"' : '';?>><?php echo html::input('keywords', '', "class='form-control'");?></td>
           </tr>
           <?php endif;?>
           <tr>