From ee5d43bea9a47fa159b46ca1803608b9e1b190a2 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Mon, 11 Apr 2022 08:53:28 +0800 Subject: [PATCH 1/2] * Fix bug#18080. --- module/task/model.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/module/task/model.php b/module/task/model.php index 18acf88775..69502b6b85 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1194,6 +1194,12 @@ class taskModel extends model $task->consumed = $oldTask->consumed; $task->parent = $oldTask->parent; + if(empty($task->closedReason)) + { + if($oldTask->status == 'done') $task->closedReason = 'done'; + if($oldTask->status == 'cancel') $task->closedReason = 'cancel'; + } + if($oldTask->name != $task->name || $oldTask->estStarted != $task->estStarted || $oldTask->deadline != $task->deadline) { $task->version = $oldTask->version + 1; @@ -1335,7 +1341,6 @@ class taskModel extends model ->checkIF($task->status == 'done' and $task->closedReason, 'closedReason', 'equal', 'done') ->batchCheckIF($task->status == 'done', 'canceledBy, canceledDate', 'empty') - ->checkIF($task->status == 'closed', 'closedReason', 'notempty') ->batchCheckIF($task->closedReason == 'cancel', 'finishedBy, finishedDate', 'empty') ->where('id')->eq((int)$taskID) ->exec(); From a60f498ea8ecedd715383b9afee106a3ad938ebc Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Mon, 11 Apr 2022 17:23:59 +0800 Subject: [PATCH 2/2] * Modify review code. --- 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 69502b6b85..2e8f10396e 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1196,7 +1196,7 @@ class taskModel extends model if(empty($task->closedReason)) { - if($oldTask->status == 'done') $task->closedReason = 'done'; + if($oldTask->status == 'done') $task->closedReason = 'done'; if($oldTask->status == 'cancel') $task->closedReason = 'cancel'; }