From ffd0c2ce7fa38b7911cb37a0aaa713d1fe77f157 Mon Sep 17 00:00:00 2001 From: liuhong Date: Wed, 8 Feb 2023 06:58:27 +0000 Subject: [PATCH] * Adjust for ticket 326. --- module/story/model.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/module/story/model.php b/module/story/model.php index 73f506732a..f206802512 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -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 and $oldParentStory->status != 'reviewing') { $status = current($childrenStatus); if($status == 'draft' or $status == 'changing') $status = 'active'; @@ -1257,11 +1257,6 @@ class storyModel extends model $status = 'active'; } - if(count($childrenStatus) == 1 and ($oldParentStory->status = 'changing' or $oldParentStory->status = 'reviewing')) - { - $status = 'closed'; - } - if($status and $oldParentStory->status != $status) { $now = helper::now();