From aff04a8e032e86004f1fb0191dd4ffed1e1bfe36 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Mon, 11 Sep 2023 06:49:18 +0000
Subject: [PATCH] * Fix bug #38505.

---
 module/story/model.php                  | 7 +++++++
 module/story/view/create.html.php       | 2 +-
 module/story/view/submitreview.html.php | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index 08aa47ffda..bb27647759 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -6798,6 +6798,13 @@ class storyModel extends model
                     $reviewers = array_map(function($reviewer) use($users){return zget($users, $reviewer);}, $reviewers);
                     $story->reviewedBy = join(' ', $reviewers);
                 }
+                if($col->name == 'reviewer')
+                {
+                    $reviewers = array_unique(array_filter($story->reviewer));
+                    $reviewers = array_map(function($reviewer) use($users){return zget($users, $reviewer);}, $reviewers);
+                    $story->reviewer = join(' ', $reviewers);
+                    $story->reviewer = "<span title='{$story->reviewer}'>" . $story->reviewer . '</span>';
+                }
                 if($col->name == 'stage')
                 {
                     $maxStage = $story->stage;
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index db65fd32d6..db0aafe1b9 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -231,7 +231,7 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
           <?php endif;?>
           <?php endif;?>
           <tr>
-            <th><?php echo $lang->story->reviewedBy;?></th>
+            <th><?php echo $lang->story->reviewers;?></th>
             <td colspan='2' id='reviewerBox'>
               <div class="table-row">
                 <?php $required = $this->story->checkForceReview() ? 'required' : '';?>
diff --git a/module/story/view/submitreview.html.php b/module/story/view/submitreview.html.php
index 6142f7d299..08dea2b920 100644
--- a/module/story/view/submitreview.html.php
+++ b/module/story/view/submitreview.html.php
@@ -27,7 +27,7 @@
     <form method='post' target='hiddenwin'>
       <table class='table table-form'>
         <tr>
-          <th class='w-80px'><?php echo $lang->story->reviewedBy;?></th>
+          <th class='w-80px'><?php echo $lang->story->reviewers;?></th>
           <td colspan='2' id='reviewerBox' <?php if($this->story->checkForceReview() or !empty($story->reviewer)) echo "class='required'";?>>
             <div class="table-row">
               <?php if(!$this->story->checkForceReview()):?>