From 0ae9dbefb018b168ff8f3f4f7b25ada9b1b6958c Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 6 Sep 2024 11:10:35 +0800
Subject: [PATCH] * [bug#54444,done,1h] show all users.

---
 module/mail/config/dtable.php  | 13 +++++++------
 module/mail/control.php        |  5 ++++-
 module/mail/ui/browse.html.php |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/module/mail/config/dtable.php b/module/mail/config/dtable.php
index 8eb96e8aec..166bc07ad0 100644
--- a/module/mail/config/dtable.php
+++ b/module/mail/config/dtable.php
@@ -13,12 +13,13 @@ $config->mail->browse->dtable->fieldList['id']['sortType'] = true;
 $config->mail->browse->dtable->fieldList['id']['required'] = true;
 $config->mail->browse->dtable->fieldList['id']['group']    = 1;
 
-$config->mail->browse->dtable->fieldList['toList']['name']     = 'toList';
-$config->mail->browse->dtable->fieldList['toList']['title']    = $lang->mail->toList;
-$config->mail->browse->dtable->fieldList['toList']['type']     = 'user';
-$config->mail->browse->dtable->fieldList['toList']['sortType'] = true;
-$config->mail->browse->dtable->fieldList['toList']['required'] = true;
-$config->mail->browse->dtable->fieldList['toList']['group']    = 2;
+$config->mail->browse->dtable->fieldList['toList']['name']      = 'toList';
+$config->mail->browse->dtable->fieldList['toList']['title']     = $lang->mail->toList;
+$config->mail->browse->dtable->fieldList['toList']['type']      = 'text';
+$config->mail->browse->dtable->fieldList['toList']['sortType']  = true;
+$config->mail->browse->dtable->fieldList['toList']['required']  = true;
+$config->mail->browse->dtable->fieldList['toList']['delimiter'] = ',';
+$config->mail->browse->dtable->fieldList['toList']['group']     = 2;
 
 $config->mail->browse->dtable->fieldList['subject']['name']     = 'subject';
 $config->mail->browse->dtable->fieldList['subject']['title']    = $lang->mail->subject;
diff --git a/module/mail/control.php b/module/mail/control.php
index 53ad3eac00..0c83eb990d 100755
--- a/module/mail/control.php
+++ b/module/mail/control.php
@@ -233,9 +233,12 @@ class mail extends control
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
+        $queueList = $this->mail->getQueue('all', $orderBy, $pager, false);
+        foreach($queueList as $queue) $queue->toList .= ',' . $queue->ccList;
+
         $this->view->title      = $this->lang->mail->browse;
 
-        $this->view->queueList = $this->mail->getQueue('all', $orderBy, $pager, false);
+        $this->view->queueList = $queueList;
         $this->view->pager     = $pager;
         $this->view->orderBy   = $orderBy;
         $this->view->users     = $this->loadModel('user')->getPairs('noletter');
diff --git a/module/mail/ui/browse.html.php b/module/mail/ui/browse.html.php
index 31c35756ba..f18aa0068c 100644
--- a/module/mail/ui/browse.html.php
+++ b/module/mail/ui/browse.html.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 */
 namespace zin;
 
+$config->mail->browse->dtable->fieldList['toList']['map'] = $users;
 $canBatchDelete = hasPriv('mail', 'batchDelete');
 $queueList      = initTableData($queueList, $config->mail->browse->dtable->fieldList);