From 1dbfa90d2b6d2f3f11fe08a93def4a20cb005c92 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 26 Jan 2024 08:44:49 +0800
Subject: [PATCH] * Adjust execution batch edit fields setting.

---
 module/execution/config.php  | 7 +++----
 module/execution/control.php | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/module/execution/config.php b/module/execution/config.php
index 12ba4f7397..cee08351a9 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -8,8 +8,9 @@ $config->execution->ownerFields       = array('PO', 'PM', 'QD', 'RD');
 $config->execution->defaultBurnPeriod = 30;
 
 $config->execution->list = new stdclass();
-$config->execution->list->exportFields       = 'id,name,projectName,PM,begin,end,status,estimate,consumed,left,progress';
-$config->execution->list->customCreateFields = '';
+$config->execution->list->exportFields          = 'id,name,projectName,PM,begin,end,status,estimate,consumed,left,progress';
+$config->execution->list->customCreateFields    = '';
+$config->execution->list->customBatchEditFields = 'days,type,teamName,desc,PO,QD,PM,RD';
 
 $config->execution->modelList['scrum']         = 'sprint';
 $config->execution->modelList['waterfall']     = 'stage';
@@ -33,8 +34,6 @@ $config->execution->edit->requiredFields    = 'name,begin,end';
 $config->execution->start->requiredFields   = 'realBegan';
 $config->execution->close->requiredFields   = 'realEnd';
 
-$config->execution->customBatchEditFields = 'days,type,teamName,desc,PO,QD,PM,RD';
-
 $config->execution->custom = new stdclass();
 $config->execution->custom->batchEditFields = 'days,PM';
 
diff --git a/module/execution/control.php b/module/execution/control.php
index b9c4ce8a1f..f924c5a832 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1235,7 +1235,7 @@ class execution extends control
             $this->project->setMenu($projectID);
             $this->view->project = $project;
             if($project->model == 'waterfall' or $project->model == 'waterfallplus') $this->lang->execution->common = $this->lang->execution->stage;
-            if($project->model == 'ipd') $this->config->execution->customBatchEditFields = 'days,teamname,desc,PO,QD,PM,RD';
+            if($project->model == 'ipd') $this->config->execution->list->customBatchEditFields = 'days,teamname,desc,PO,QD,PM,RD';
         }
         else
         {
@@ -1257,7 +1257,7 @@ class execution extends control
         list($pmUsers, $poUsers, $qdUsers, $rdUsers) = $this->executionZen->setUserMoreLink($executions);
 
         /* Set custom fields. */
-        foreach(explode(',', $this->config->execution->customBatchEditFields) as $field) $customFields[$field] = str_replace($this->lang->executionCommon, $this->lang->execution->common, $this->lang->execution->$field);
+        foreach(explode(',', $this->config->execution->list->customBatchEditFields) as $field) $customFields[$field] = str_replace($this->lang->executionCommon, $this->lang->execution->common, $this->lang->execution->$field);
 
         $this->view->customFields = $customFields;
         $this->view->showFields   = $this->config->execution->custom->batchEditFields;