From a348ddf13facdcd3772d0eb01e14e6e3dd07c8b7 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Fri, 26 Jul 2024 09:07:25 +0000
Subject: [PATCH]  * [bug#52736,done,2h] Process multiple users.

---
 module/pivot/config.php             |  1 +
 module/pivot/model.php              |  1 +
 module/pivot/ui/drillmodal.html.php | 12 ++++++++++++
 module/story/config/dtable.php      |  1 +
 4 files changed, 15 insertions(+)

diff --git a/module/pivot/config.php b/module/pivot/config.php
index 0bf05d87dd..b230d80b48 100644
--- a/module/pivot/config.php
+++ b/module/pivot/config.php
@@ -182,6 +182,7 @@ $config->pivot->objectTableFields->story = array();
 $config->pivot->objectTableFields->story['title']['title']   = $lang->pivot->drill->storyName;
 $config->pivot->objectTableFields->story['title']['link']    = array('url' => helper::createLink('{type}', 'view', 'storyID={id}'), 'target' => '_blank');
 $config->pivot->objectTableFields->story['reviewer']['name'] = 'reviewedBy';
+$config->pivot->objectTableFields->story['reviewer']['type'] = 'user';
 
 $config->pivot->objectTableFields->testcase = array();
 $config->pivot->objectTableFields->testcase['id']['name']    = 'id';
diff --git a/module/pivot/model.php b/module/pivot/model.php
index 6e7b2f805a..67c2d91e7d 100644
--- a/module/pivot/model.php
+++ b/module/pivot/model.php
@@ -2528,6 +2528,7 @@ class pivotModel extends model
                     if((!in_array($fieldKey, $nameTypeCols) && $settingKey == 'link') || $object == 'doc') unset($fieldSetting['link']);
                     if(isset($this->config->pivot->objectTableFields->$object[$fieldKey][$settingKey])) $fieldSetting[$settingKey] = $this->config->pivot->objectTableFields->$object[$fieldKey][$settingKey];
                 }
+
                 $cols[$fieldKey] = $fieldSetting;
             }
         }
diff --git a/module/pivot/ui/drillmodal.html.php b/module/pivot/ui/drillmodal.html.php
index f6dcb74d0a..0c5450e415 100644
--- a/module/pivot/ui/drillmodal.html.php
+++ b/module/pivot/ui/drillmodal.html.php
@@ -16,6 +16,18 @@ modalHeader
     set::title($lang->pivot->step3->drillView)
 );
 
+foreach($datas as $index => $data)
+{
+    foreach($data as $key => $value)
+    {
+        foreach($cols as $col)
+        {
+            if($col['name'] != $key) continue;
+            if($col['type'] == 'user' && strpos($value, ',') !== false) $datas[$index]->$key = explode(',', $value);
+        }
+    }
+}
+
 dtable
 (
     $from == 'screen' ? set::_class('dark') : null,
diff --git a/module/story/config/dtable.php b/module/story/config/dtable.php
index a882b79b51..efe4438fd5 100644
--- a/module/story/config/dtable.php
+++ b/module/story/config/dtable.php
@@ -130,6 +130,7 @@ $config->story->dtable->fieldList['estimate']['show']     = true;
 $config->story->dtable->fieldList['estimate']['group']    = 5;
 
 $config->story->dtable->fieldList['reviewer']['name']     = 'reviewer';
+$config->story->dtable->fieldList['reviewer']['type']     = 'text';
 $config->story->dtable->fieldList['reviewer']['title']    = $lang->story->reviewer;
 $config->story->dtable->fieldList['reviewer']['width']    = '100';
 $config->story->dtable->fieldList['reviewer']['sortType'] = false;