From 577b42f32cf9ada309f4d9fb2105b86fe9a86356 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 6 Jul 2022 08:41:20 +0800
Subject: [PATCH] * Hide required fields in custom forms.

---
 module/bug/js/batchcreate.js        | 16 ----------------
 module/bug/js/batchedit.js          |  5 +++++
 module/bug/js/common.js             | 26 ++++++++++++--------------
 module/bug/view/batchedit.html.php  |  1 +
 module/task/js/batchedit.js         |  5 +++++
 module/task/view/batchedit.html.php |  1 +
 module/testcase/js/batchedit.js     | 12 +-----------
 7 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/module/bug/js/batchcreate.js b/module/bug/js/batchcreate.js
index 9c446c4e7d..ac795e5b13 100644
--- a/module/bug/js/batchcreate.js
+++ b/module/bug/js/batchcreate.js
@@ -76,22 +76,6 @@ function showCheckedFields(fields)
     });
 }
 
-/**
- * Hidden require field.
- *
- * @access public
- * @return void
- */
-function hiddenRequireFields()
-{
-    $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function()
-    {
-        var field    = ',' + $(this).val() + ',';
-        var required = ',' + requiredFields + ',';
-        if(required.indexOf(field) >= 0) $(this).closest('div').addClass('hidden');
-    });
-}
-
 /**
  * Set opened builds.
  *
diff --git a/module/bug/js/batchedit.js b/module/bug/js/batchedit.js
index 26a3876963..42770c7cfc 100644
--- a/module/bug/js/batchedit.js
+++ b/module/bug/js/batchedit.js
@@ -72,4 +72,9 @@ $(document).on('change', 'select', function()
 $(function()
 {
     $('#subNavbar li[data-id="bug"]').addClass('active');
+
+    $('#customField').click(function()
+    {
+        hiddenRequireFields();
+    });
 });
diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 166e71d0d1..e100d8755c 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -887,20 +887,18 @@ function setBranchRelated(branchID, productID, num)
     }
 }
 
-$(document).ready(function()
+/**
+ * Hidden require field.
+ *
+ * @access public
+ * @return void
+ */
+function hiddenRequireFields()
 {
-    $('#customField').click(function()
+    $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function()
     {
-        $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function()
-        {
-            var field    = ',' + $(this).val() + ',';
-            var required = ',' + requiredFields + ',';
-            if(required.indexOf(field) >= 0) $(this).attr('disabled', 'disabled');
-        });
+        var field    = ',' + $(this).val() + ',';
+        var required = ',' + requiredFields + ',';
+        if(required.indexOf(field) >= 0) $(this).closest('div').addClass('hidden');
     });
-
-    $('#formSettingForm .btn-primary').click(function()
-    {
-        $('#formSettingForm > .checkboxes > .checkbox-primary > input').removeAttr('disabled');
-    });
-});
+}
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index 6cfadedd8a..625c95320d 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -14,6 +14,7 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::set('dittoNotice', $this->lang->bug->dittoNotice);?>
 <?php js::set('showFields', $showFields);?>
+<?php js::set('requiredFields', $config->bug->edit->requiredFields);?>
 <div id='mainContent' class='main-content fade'>
   <div class='main-header'>
     <h2><?php echo $lang->bug->common . $lang->colon . $lang->bug->batchEdit;?></h2>
diff --git a/module/task/js/batchedit.js b/module/task/js/batchedit.js
index 32dd170945..73af9a1c12 100644
--- a/module/task/js/batchedit.js
+++ b/module/task/js/batchedit.js
@@ -49,4 +49,9 @@ $(document).on('change', 'select', function()
 $(function()
 {
     $('#subNavbar li[data-id="task"]').addClass('active');
+
+    $('#customField').click(function()
+    {
+        hiddenRequireFields();
+    });
 });
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index ebc689af14..611ddbb728 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -16,6 +16,7 @@
 $dittoNotice = sprintf($this->lang->task->dittoNotice, $lang->executionCommon);
 js::set('dittoNotice', $dittoNotice);
 js::set('showFields', $showFields);
+js::set('requiredFields', $config->task->edit->requiredFields);
 ?>
 <div id='mainContent' class='main-content fade'>
   <div class='main-header'>
diff --git a/module/testcase/js/batchedit.js b/module/testcase/js/batchedit.js
index 280f5d2e45..e82c364e91 100644
--- a/module/testcase/js/batchedit.js
+++ b/module/testcase/js/batchedit.js
@@ -116,17 +116,7 @@ $(function()
 
     $('#customField').click(function()
     {
-        $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function()
-        {
-            var field    = ',' + $(this).val() + ',';
-            var required = ',' + requiredFields + ',';
-            if(required.indexOf(field)  >= 0) $(this).attr('disabled', 'disabled');
-        });
-    });
-
-    $('#formSettingForm .btn-primary').click(function()
-    {
-        $('#formSettingForm > .checkboxes > .checkbox-primary > input').removeAttr('disabled');
+        hiddenRequireFields();
     });
 });