From 402d4a63330a8679697337a306f6a420b868d650 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Mon, 31 Oct 2022 07:31:00 +0000
Subject: [PATCH] * Handle feedback #1304.

---
 module/task/model.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index ba26762096..21aae6c5e2 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3014,8 +3014,16 @@ class taskModel extends model
         $data->status   = ($left == 0 && $consumed != 0) ? 'done' : $task->status;
         if($estimate->isLast and $consumed == 0 and $task->status != 'wait')
         {
-            $data->status = 'wait';
-            $data->left   = $task->estimate;
+            $data->status       = 'wait';
+            $data->left         = $task->estimate;
+            $data->finishedBy   = '';
+            $data->canceledBy   = '';
+            $data->closedBy     = '';
+            $data->closedReason = '';
+            $data->finishedDate = '0000-00-00 00:00:00';
+            $data->canceledDate = '0000-00-00 00:00:00';
+            $data->closedDate   = '0000-00-00 00:00:00';
+            if($task->assignedTo == 'closed') $data->assignedTo = $this->app->user->account;
         }
         elseif($consumed != 0 and $left == 0 and strpos('done,pause,cancel,closed', $task->status) === false)
         {