From d470d7ce51c138b11c9dad8676ca8a9dbeee0ac5 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 7 Sep 2023 09:27:46 +0000 Subject: [PATCH] * Fix bug #38219. --- module/story/model.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/module/story/model.php b/module/story/model.php index e027452c48..5112973543 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -6192,7 +6192,8 @@ class storyModel extends model if(isset($story->finalResult)) { - if($story->finalResult == 'reject') $this->action->create('story', $story->id, 'ReviewRejected'); + $isChanged = $story->changedBy ? true : false; + if($story->finalResult == 'reject') $this->action->create('story', $story->id, 'ReviewRejected', '', $isChanged ? 'changing' : 'draft'); if($story->finalResult == 'pass') $this->action->create('story', $story->id, 'ReviewPassed'); if($story->finalResult == 'clarify') $this->action->create('story', $story->id, 'ReviewClarified'); if($story->finalResult == 'revert') $this->action->create('story', $story->id, 'ReviewReverted'); @@ -6522,10 +6523,8 @@ class storyModel extends model ->fetch(); $lastAction = $lastRecord->action; - if(strpos(',closed,reviewrejected,', ",$lastAction,") !== false) - { - $status = strpos($lastRecord->extra, '|') !== false ? substr($lastRecord->extra, strpos($lastRecord->extra, '|') + 1) : 'active'; - } + if($lastAction == 'reviewrejected') $status = $lastRecord->extra; + if($lastAction == 'closed') $status = strpos($lastRecord->extra, '|') !== false ? substr($lastRecord->extra, strpos($lastRecord->extra, '|') + 1) : 'active'; /* Activate parent story. */ if($lastAction == 'closedbysystem')