From a55f5f9df60577e2cd2807902029c7cab9c17d9b Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Tue, 26 Apr 2022 09:03:06 +0000 Subject: [PATCH 1/2] * Fix bug #15338. --- module/task/control.php | 2 +- module/task/model.php | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/module/task/control.php b/module/task/control.php index 132f3f5f71..6b29d20950 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -565,7 +565,7 @@ class task extends control if($this->post->names) { $allChanges = $this->task->batchUpdate(); - if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); + if(dao::isError()) return print(js::error(dao::getError())); if(!empty($allChanges)) { diff --git a/module/task/model.php b/module/task/model.php index 3242900dd1..7591f728ff 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1194,6 +1194,13 @@ class taskModel extends model $task->consumed = $oldTask->consumed; $task->parent = $oldTask->parent; + if(strpos(',doing,pause,', $data->statuses[$taskID]) and empty($teams) and empty($task->left)) + { + $taskStatus = $data->statuses[$taskID]; + dao::$errors[] = sprintf($this->lang->task->error->leftEmptyAB, zget($this->lang->task->statusList, $taskStatus)); + return false; + } + if(empty($task->closedReason)) { if($oldTask->status == 'done') $task->closedReason = 'done'; From 9851bc1047b55e28bd9cd16329a369ab0d380909 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Tue, 26 Apr 2022 09:10:29 +0000 Subject: [PATCH 2/2] * Fix bug #15338. --- module/task/model.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index 7591f728ff..f3da5de941 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1194,10 +1194,9 @@ class taskModel extends model $task->consumed = $oldTask->consumed; $task->parent = $oldTask->parent; - if(strpos(',doing,pause,', $data->statuses[$taskID]) and empty($teams) and empty($task->left)) + if(strpos(',doing,pause,', $task->status) and empty($teams) and empty($task->left)) { - $taskStatus = $data->statuses[$taskID]; - dao::$errors[] = sprintf($this->lang->task->error->leftEmptyAB, zget($this->lang->task->statusList, $taskStatus)); + dao::$errors[] = sprintf($this->lang->task->error->leftEmptyAB, zget($this->lang->task->statusList, $task->status)); return false; }