diff --git a/module/task/model.php b/module/task/model.php index 18acf88775..2e8f10396e 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();