From 8efcc37f4bafe86b1feae138613936d99bf57313 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 31 Mar 2022 11:02:59 +0800
Subject: [PATCH] * Fix bug #18083.

---
 module/task/lang/en.php    |  4 ++--
 module/task/lang/zh-cn.php |  4 ++--
 module/task/model.php      | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 4c7464d2d1..b6eacee3be 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -246,8 +246,8 @@ $lang->task->error->finishedDateEmpty = '"Finished Date" should not be empty.';
 $lang->task->error->finishedDateSmall = '"Finished Date" should be > "Real Started"';
 $lang->task->error->alreadyConsumed   = 'The currently selected parent task has been consumed.';
 $lang->task->error->date              = 'The date should be >= today.';
-$lang->task->error->leftEmpty         = 'When the task status is %s, "Hours Left" cannot be 0';
-$lang->task->error->leftEmptyAB       = 'task#%sWhen the task status is %s, "Left" cannot be 0';
+$lang->task->error->leftEmptyAB       = 'When the task status is %s, "Hours Left" cannot be 0';
+$lang->task->error->leftEmpty         = 'Task#%sWhen the task status is %s, "Left" cannot be 0';
 
 /* Report. */
 $lang->task->report = new stdclass();
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index b289c2171b..f1a9a910b1 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -246,8 +246,8 @@ $lang->task->error->finishedDateEmpty = '实际完成不能为空';
 $lang->task->error->finishedDateSmall = '实际完成不能小于实际开始';
 $lang->task->error->alreadyConsumed   = '当前选中的父任务已有消耗。';
 $lang->task->error->date              = '日期不能大于今天';
-$lang->task->error->leftEmpty         = '任务状态为%s时，预计剩余不能为0';
-$lang->task->error->leftEmptyAB       = 'task#%s任务状态为%s时，剩余不能为0';
+$lang->task->error->leftEmptyAB       = '任务状态为%s时，预计剩余不能为0';
+$lang->task->error->leftEmpty         = 'Task#%s任务状态为%s时，剩余不能为0';
 
 /* Report. */
 $lang->task->report         = new stdclass();
diff --git a/module/task/model.php b/module/task/model.php
index 4ffc3f2522..93ed0af681 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -998,9 +998,9 @@ class taskModel extends model
             $requiredFields = str_replace(',estimate,', ',', $requiredFields);
         }
 
-        if(strpos(',done,wait,cancel,closed,', $task->status) === false && empty($teams) && empty($task->left))
+        if(strpos(',doing,pause,', $task->status) && empty($teams) && empty($task->left))
         {
-            dao::$errors[] = sprintf($this->lang->task->error->leftEmpty, $this->lang->task->statusList[$task->status]);
+            dao::$errors[] = sprintf($this->lang->task->error->leftEmptyAB, $this->lang->task->statusList[$task->status]);
             return false;
         }
 
@@ -1263,13 +1263,13 @@ class taskModel extends model
             if($task->status == 'cancel') continue;
             if($task->status == 'done' and $task->consumed == false)
             {
-                dao::$errors[] = 'task#' . $taskID . sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime);
+                dao::$errors[] = 'Task#' . $taskID . sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime);
                 return false;
             }
 
             if(!empty($task->deadline) and $task->estStarted > $task->deadline)
             {
-                dao::$errors[] = 'task#' . $taskID . $this->lang->task->error->deadlineSmall;
+                dao::$errors[] = 'Task#' . $taskID . $this->lang->task->error->deadlineSmall;
                 return false;
             }
 
@@ -1289,9 +1289,9 @@ class taskModel extends model
 
         foreach($tasks as $taskID => $task)
         {
-            if(strpos(',done,wait,cancel,closed,', $task->status) === false && empty($teams) && $task->parent >= 0 && empty($task->left))
+            if(strpos(',doing,pause,', $task->status) && empty($teams) && $task->parent >= 0 && empty($task->left))
             {
-                dao::$errors[] = sprintf($this->lang->task->error->leftEmptyAB, $taskID, $this->lang->task->statusList[$task->status]);
+                dao::$errors[] = sprintf($this->lang->task->error->leftEmpty, $taskID, $this->lang->task->statusList[$task->status]);
                 return false;
             }
 
@@ -1315,7 +1315,7 @@ class taskModel extends model
                 ->exec();
             if(dao::isError())
             {
-                dao::$errors[] = 'task#' . $taskID . dao::getError(true);
+                dao::$errors[] = 'Task#' . $taskID . dao::getError(true);
                 return false;
             }