Merge branch '15.2'

2021-08-02 16:31:42 +08:00
parent 4dd58196d7 545d611d56
commit bbe793a8aa
63 changed files with 359 additions and 150 deletions
@@ -662,6 +662,9 @@ class taskModel extends model

                if($parentTask->story) $this->loadModel('story')->setStage($parentTask->story);
                $newParentTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($parentID)->fetch();
+
+                unset($oldParentTask->subStatus);
+                unset($newParentTask->subStatus);
                $changes = common::createChanges($oldParentTask, $newParentTask);
                $action  = '';
                if($status == 'done' and $parentTask->status != 'done')     $action = 'Finished';