Merge branch 'ticket_326' into 'master'

code for Ticket 326 bug 31981 See merge request easycorp/zentaopms!6891
2023-02-08 09:17:24 +00:00
parent bc4c940d20 534b5e6471
commit 436f7a3313
1 changed files with 1 additions and 1 deletions
@@ -1247,7 +1247,7 @@ class storyModel extends model
        if(empty($childrenStatus)) return $this->dao->update(TABLE_STORY)->set('parent')->eq('0')->where('id')->eq($parentID)->exec();

        $status = $oldParentStory->status;
-        if(count($childrenStatus) == 1 and $oldParentStory->status != 'changing' and $oldParentStory->status != 'reviewing')
+        if(count($childrenStatus) == 1)
        {
            $status = current($childrenStatus);
            if($status == 'draft' or $status == 'changing') $status = 'active';