From 0dcd8078f1e699785e8a29c6924714816e1693a2 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 4 Jan 2024 13:36:02 +0800
Subject: [PATCH] * Process mailto field of task list.

---
 module/execution/control.php      | 1 +
 module/execution/ui/task.html.php | 1 +
 module/task/config/dtable.php     | 7 ++++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 7cae7d2dae..166b999ae8 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -205,6 +205,7 @@ class execution extends control
         $this->view->moduleTree  = $this->tree->getTaskTreeMenu($executionID, (int)$productID, 0, array('treeModel', 'createTaskLink'), $showAllModule);
         $this->view->memberPairs = $memberPairs;
         $this->view->execution   = $execution;
+        $this->view->users       = $this->loadModel('user')->getPairs('noletter');
         $this->display();
     }
 
diff --git a/module/execution/ui/task.html.php b/module/execution/ui/task.html.php
index 8c7fac12d1..f91b8b44ef 100644
--- a/module/execution/ui/task.html.php
+++ b/module/execution/ui/task.html.php
@@ -50,6 +50,7 @@ if(common::canModify('execution', $execution))
 }
 
 $cols = $this->loadModel('datatable')->getSetting('execution');
+$cols['mailto']['userMap'] = $users;
 $tableData = initTableData($tasks, $cols, $this->task);
 
 toolbar
diff --git a/module/task/config/dtable.php b/module/task/config/dtable.php
index f967b5bfbc..a69a726931 100644
--- a/module/task/config/dtable.php
+++ b/module/task/config/dtable.php
@@ -179,9 +179,10 @@ $config->task->dtable->fieldList['desc']['title']   = 'desc';
 $config->task->dtable->fieldList['desc']['control'] = 'textarea';
 $config->task->dtable->fieldList['desc']['display'] = false;
 
-$config->task->dtable->fieldList['mailto']['type']     = 'user';
-$config->task->dtable->fieldList['mailto']['sortType'] = true;
-$config->task->dtable->fieldList['mailto']['group']    = 9;
+$config->task->dtable->fieldList['mailto']['type']      = 'text';
+$config->task->dtable->fieldList['mailto']['sortType']  = true;
+$config->task->dtable->fieldList['mailto']['group']     = 9;
+$config->task->dtable->fieldList['mailto']['delimiter'] = ',';
 
 $config->task->dtable->fieldList['actions']['type']     = 'actions';
 $config->task->dtable->fieldList['actions']['width']    = '160px';