From f495a6cb622a582c81861ac11396bfcb6a87b41f Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Tue, 16 Nov 2021 14:46:14 +0800
Subject: [PATCH] * Finish task 44492

---
 module/URAndSR              |  0
 module/bug/config.php       |  2 +-
 module/bug/control.php      | 11 +++++++++++
 module/testcase/config.php  |  2 +-
 module/testcase/control.php | 11 +++++++++++
 5 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 module/URAndSR

diff --git a/module/URAndSR b/module/URAndSR
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/module/bug/config.php b/module/bug/config.php
index d14ac64ac9..1998a5a7ee 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -44,7 +44,7 @@ $config->bug->list->customBatchEditFields   = 'type,severity,pri,productplan,ass
 
 $config->bug->custom = new stdclass();
 $config->bug->custom->createFields      = $config->bug->list->customCreateFields;
-$config->bug->custom->batchCreateFields = 'execution,deadline,steps,type,severity,os,browser';
+$config->bug->custom->batchCreateFields = 'execution,deadline,steps,type,severity,os,browser,%s';
 $config->bug->custom->batchEditFields   = 'type,severity,pri,branch,assignedTo,deadline,status,resolvedBy,resolution';
 
 $config->bug->editor = new stdclass();
diff --git a/module/bug/control.php b/module/bug/control.php
index a48fc1ec09..924eac9c45 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -699,6 +699,17 @@ class bug extends control
             if($product->type != 'normal') $customFields[$product->type] = $this->lang->product->branchName[$product->type];
             $customFields[$field] = $this->lang->bug->$field;
         }
+
+        if($product->type != 'normal')
+        {
+            $this->config->bug->custom->batchCreateFields = sprintf($this->config->bug->custom->batchCreateFields, $product->type);
+        }
+        else
+        {
+            $this->config->bug->custom->batchCreateFields = sprintf($this->config->bug->custom->batchCreateFields, '');
+            $this->config->bug->custom->batchCreateFields = trim($this->config->bug->custom->batchCreateFields, ',');
+        }
+
         $showFields = $this->config->bug->custom->batchCreateFields;
         if($product->type == 'normal')
         {
diff --git a/module/testcase/config.php b/module/testcase/config.php
index c3d0ddf5ea..be18fd7b87 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -29,7 +29,7 @@ $config->testcase->customBatchEditFields   = 'module,story,stage,precondition,st
 
 $config->testcase->custom = new stdclass();
 $config->testcase->custom->createFields      = $config->testcase->customCreateFields;
-$config->testcase->custom->batchCreateFields = 'module,story';
+$config->testcase->custom->batchCreateFields = 'module,story,%s';
 $config->testcase->custom->batchEditFields   = 'branch,module,stage,status,pri,story';
 
 global $lang;
diff --git a/module/testcase/control.php b/module/testcase/control.php
index d900def98d..55bf533afb 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -536,6 +536,17 @@ class testcase extends control
             if($product->type != 'normal') $customFields[$product->type] = $this->lang->product->branchName[$product->type];
             $customFields[$field] = $this->lang->testcase->$field;
         }
+
+        if($product->type != 'normal')
+        {
+            $this->config->testcase->custom->batchCreateFields = sprintf($this->config->testcase->custom->batchCreateFields, $product->type);
+        }
+        else
+        {
+            $this->config->testcase->custom->batchCreateFields = sprintf($this->config->testcase->custom->batchCreateFields, '');
+            $this->config->testcase->custom->batchCreateFields = trim($this->config->testcase->custom->batchCreateFields, ',');
+        }
+
         $showFields = $this->config->testcase->custom->batchCreateFields;
         if($product->type == 'normal')
         {