From db19c66db3b12009dc615703d4d94d0409c871b9 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 13 Jul 2022 14:45:15 +0800 Subject: [PATCH] * Fix bug #23641. --- module/task/model.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index 6a013a8c03..aac5a3fec2 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1239,8 +1239,8 @@ class taskModel extends model if(empty($task->closedReason)) { - if($oldTask->status == 'done') $task->closedReason = 'done'; - if($oldTask->status == 'cancel') $task->closedReason = 'cancel'; + if($oldTask->status == 'done' and $task->status == 'closed') $task->closedReason = 'done'; + if($oldTask->status == 'cancel' and $task->status == 'closed') $task->closedReason = 'cancel'; } if($oldTask->name != $task->name || $oldTask->estStarted != $task->estStarted || $oldTask->deadline != $task->deadline) @@ -3749,13 +3749,13 @@ class taskModel extends model /** * Build nested list. - * - * @param objecct $execution - * @param object $task - * @param bool $isChild - * @param bool $showmore + * + * @param objecct $execution + * @param object $task + * @param bool $isChild + * @param bool $showmore * @access public - * @return string + * @return string */ public function buildNestedList($execution, $task, $isChild = false, $showmore = false, $users) {