Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [bug#54444,done,1h] show all users.

Browse Source
This commit is contained in:
liumengyi
2024-09-20 10:23:47 +08:00
committed by 刘刚
parent 97905366bf
commit 0ae9dbefb0
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mail/config/dtable.php
+7 -6
View File
@@ -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;
module/mail/control.php
+4 -1
View File
@@ -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');
module/mail/ui/browse.html.php
+1
View File
@@ -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);