From 0159cabcff5ce97adc21d6c6df36b15a2c33e48b Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 7 Nov 2022 09:05:56 +0800
Subject: [PATCH] * Fix bug #29272.

---
 module/task/control.php | 31 ++-----------------------------
 module/task/model.php   |  5 -----
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index aabdfdaf89..868ed21179 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -467,17 +467,7 @@ class task extends control
         $modules       = $this->loadModel('tree')->getTaskOptionMenu($executionID, 0, 0, $showAllModule ? 'allModule' : '');
 
         /* Set Custom*/
-        if($this->config->systemMode == 'new')
-        {
-            $project = $this->project->getByID($execution->project);
-            if($project->model == 'waterfall') $this->config->task->create->requiredFields .= ',estStarted,deadline';
-        }
-
-        foreach(explode(',', $this->config->task->customBatchCreateFields) as $field)
-        {
-            if($execution->type == 'stage' and strpos('estStarted,deadline', $field) !== false) continue;
-            $customFields[$field] = $this->lang->task->$field;
-        }
+        foreach(explode(',', $this->config->task->customBatchCreateFields) as $field) $customFields[$field] = $this->lang->task->$field;
 
         $showFields = $this->config->task->custom->batchCreateFields;
         if($execution->lifetime == 'ops' or $execution->attribute == 'request' or $execution->attribute == 'review')
@@ -779,24 +769,7 @@ class task extends control
         if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? sprintf($this->lang->suhosinInfo, $countInputVars) : sprintf($this->lang->maxVarsInfo, $countInputVars);
 
         /* Set Custom*/
-        if(isset($execution))
-        {
-            if($this->config->systemMode == 'new')
-            {
-                $project = $this->project->getByID($execution->project);
-                if($project->model == 'waterfall') $this->config->task->edit->requiredFields .= ',estStarted,deadline';
-            }
-
-            foreach(explode(',', $this->config->task->customBatchEditFields) as $field)
-            {
-                if($execution->type == 'stage' and strpos('estStarted,deadline', $field) !== false) continue;
-                $customFields[$field] = $this->lang->task->$field;
-            }
-        }
-        else
-        {
-            foreach(explode(',', $this->config->task->customBatchEditFields) as $field) $customFields[$field] = $this->lang->task->$field;
-        }
+        foreach(explode(',', $this->config->task->customBatchEditFields) as $field) $customFields[$field] = $this->lang->task->$field;
 
         $this->view->customFields = $customFields;
         $this->view->showFields   = $this->config->task->custom->batchEditFields;
diff --git a/module/task/model.php b/module/task/model.php
index 74ee51c402..037bc6c3c5 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1466,11 +1466,6 @@ class taskModel extends model
                 return false;
             }
 
-            if($this->config->systemMode == 'new')
-            {
-                $project = $this->loadModel('project')->getByID($oldTask->project);
-                if($project->model == 'waterfall') $this->config->task->edit->requiredFields .= ',estStarted,deadline';
-            }
             foreach(explode(',', $this->config->task->edit->requiredFields) as $field)
             {
                 $field = trim($field);