From e18e3cbe1a308f356e9826f1bcd6ee10bf0ae5f9 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Wed, 19 May 2021 15:53:28 +0800 Subject: [PATCH] * Fix bug #12725. --- module/story/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/model.php b/module/story/model.php index e0db49fd94..4cc16f86e6 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1148,7 +1148,6 @@ class storyModel extends model $now = helper::now(); $date = helper::today(); $story = fixer::input('post') - ->add('reviewedBy', $oldStory->reviewedBy . ',' . $this->app->user->account) ->setDefault('reviewedDate', $date) ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) @@ -1160,6 +1159,7 @@ class storyModel extends model ->setIF($this->post->result == 'revert', 'version', $this->post->preVersion) ->setIF($this->post->result == 'revert', 'status', 'active') ->setIF($this->post->closedReason == 'done', 'stage', 'released') + ->setIF(strpos($oldStory->reviewedBy, $this->app->user->account) === false, 'reviewedBy', $oldStory->reviewedBy . ',' . $this->app->user->account) ->removeIF($this->post->result != 'reject', 'closedReason, duplicateStory, childStories') ->removeIF($this->post->result == 'reject' and $this->post->closedReason != 'duplicate', 'duplicateStory') ->removeIF($this->post->result == 'reject' and $this->post->closedReason != 'subdivided', 'childStories')