From 9887a64cfb6a262f8f8975ce1308d031a8c199fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Tue, 17 May 2022 16:12:53 +0800
Subject: [PATCH 1/3] *Fix bug #22375.

---
 module/task/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/task/model.php b/module/task/model.php
index f04071e1dc..e74b70e6b0 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1022,7 +1022,7 @@ class taskModel extends model
             $requiredFields = str_replace(',estimate,', ',', $requiredFields);
         }
 
-        if(strpos(',doing,pause,', $task->status) && empty($teams) && empty($task->left))
+        if(strpos(',doing,pause,', $task->status) && empty($task->left))
         {
             dao::$errors[] = sprintf($this->lang->task->error->leftEmptyAB, $this->lang->task->statusList[$task->status]);
             return false;

From 3099628ce164386af5af739970d06433cda9dda7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Tue, 17 May 2022 17:08:27 +0800
Subject: [PATCH 2/3] *Optimize the code.

---
 module/task/js/edit.js         | 7 +++++--
 module/task/model.php          | 2 +-
 module/task/view/edit.html.php | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/module/task/js/edit.js b/module/task/js/edit.js
index c8c8586921..bce67de89a 100644
--- a/module/task/js/edit.js
+++ b/module/task/js/edit.js
@@ -191,9 +191,12 @@ $('#confirmButton').click(function()
     if(memberCount < 2)
     {
         alert(teamMemberError);
+        return false;
     }
-    else
+    if(totalLeft == 0)
     {
-        $('.close').click();
+        alert(totalLeftError);
+        return false;
     }
+    $('.close').click();
 });
diff --git a/module/task/model.php b/module/task/model.php
index e74b70e6b0..f04071e1dc 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1022,7 +1022,7 @@ class taskModel extends model
             $requiredFields = str_replace(',estimate,', ',', $requiredFields);
         }
 
-        if(strpos(',doing,pause,', $task->status) && empty($task->left))
+        if(strpos(',doing,pause,', $task->status) && empty($teams) && empty($task->left))
         {
             dao::$errors[] = sprintf($this->lang->task->error->leftEmptyAB, $this->lang->task->statusList[$task->status]);
             return false;
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 8846d49488..964ef08841 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -22,6 +22,7 @@
 <?php js::set('changeExecutionConfirmed', false);?>
 <?php js::set('newRowCount', count($task->team) < 6 ? 6 - count($task->team) : 1);?>
 <?php js::set('teamMemberError', $lang->task->error->teamMember);?>
+<?php js::set('totalLeftError', sprintf($this->lang->task->error->leftEmptyAB, $this->lang->task->statusList[$task->status]));?>
 <div class='main-content' id='mainContent'>
   <form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
     <div class='main-header'>
@@ -252,7 +253,7 @@
     <div class="modal fade modal-team" id="modalTeam"  data-scroll-inside='false'>
       <div class="modal-dialog">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal">
+          <button type="button" class="close hidden" data-dismiss="modal">
             <i class="icon icon-close"></i>
           </button>
           <h4 class="modal-title"><?php echo $lang->task->team?></h4>

From 545dcf550cf11fe259c6e74fdf5eb60cd2a231a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Tue, 17 May 2022 17:28:11 +0800
Subject: [PATCH 3/3] *Optimize the code.

---
 module/task/js/edit.js         | 2 +-
 module/task/view/edit.html.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/task/js/edit.js b/module/task/js/edit.js
index bce67de89a..0a49d29468 100644
--- a/module/task/js/edit.js
+++ b/module/task/js/edit.js
@@ -193,7 +193,7 @@ $('#confirmButton').click(function()
         alert(teamMemberError);
         return false;
     }
-    if(totalLeft == 0)
+    if(totalLeft == 0 && (taskStatus == 'doing' || taskStatus == 'pause'))
     {
         alert(totalLeftError);
         return false;
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 964ef08841..7ccf449406 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -18,6 +18,7 @@
 <?php js::set('oldAssignedTo', $task->assignedTo);?>
 <?php js::set('oldExecutionID', $task->execution);?>
 <?php js::set('oldConsumed', $task->consumed);?>
+<?php js::set('taskStatus', $task->status);?>
 <?php js::set('confirmChangeExecution', $lang->task->confirmChangeExecution);?>
 <?php js::set('changeExecutionConfirmed', false);?>
 <?php js::set('newRowCount', count($task->team) < 6 ? 6 - count($task->team) : 1);?>