diff --git a/module/story/model.php b/module/story/model.php index 43bb96d460..0af26c0100 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -809,10 +809,13 @@ class storyModel extends model $story->reviewedBy = $oldStory->reviewedBy; $story = $this->updateStoryByReview($storyID, $oldStory, $story); } + + $oldStory->reviewers = implode(',', array_keys($oldReviewer)); + $story->reviewers = implode(',', array_keys($this->getReviewerPairs($storyID, $oldStory->version))); } $this->dao->update(TABLE_STORY) - ->data($story) + ->data($story, 'reviewers') ->autoCheck() ->checkIF(isset($story->closedBy), 'closedReason', 'notempty') ->checkIF(isset($story->closedReason) and $story->closedReason == 'done', 'stage', 'notempty') @@ -889,8 +892,6 @@ class storyModel extends model if(empty($oldStory->plan) or empty($story->plan)) $this->setStage($storyID); // Set new stage for this story. } - $oldStory->reviewers = implode(',', array_keys($oldReviewer)); - $story->reviewers = implode(',', array_keys($this->getReviewerPairs($storyID, $oldStory->version))); unset($oldStory->parent); unset($story->parent); return common::createChanges($oldStory, $story); diff --git a/module/webhook/model.php b/module/webhook/model.php index 6588fdb7d9..37393c3754 100644 --- a/module/webhook/model.php +++ b/module/webhook/model.php @@ -596,7 +596,7 @@ class webhookModel extends model $toList = implode(',', $toList); } - $toList = str_replace(",{$this->app->user->account},", '', ",$toList,"); + $toList = str_replace(",{$this->app->user->account},", ' ', ",$toList,"); $openIdList = $this->getBoundUsers($webhookID, $toList); $openIdList = join(',', $openIdList);