* Fix bug #15338.

2022-04-26 09:03:06 +00:00
parent ceceb6bc9e
commit a55f5f9df6
2 changed files with 8 additions and 1 deletions
@@ -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))
            {
@@ -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';