From c60d92347664f4e82ca5a09aed76ed52cc20e912 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 2 Dec 2024 15:17:44 +0800
Subject: [PATCH] * [task#133217,start,1h] check assignTo.

---
 module/execution/js/task.ui.js    | 5 +++++
 module/execution/ui/task.html.php | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/module/execution/js/task.ui.js b/module/execution/js/task.ui.js
index 00b8940534..819df2c1d4 100644
--- a/module/execution/js/task.ui.js
+++ b/module/execution/js/task.ui.js
@@ -162,6 +162,11 @@ window.renderCell = function(result, info)
         {
             result[0]['props']['children'][1]['props']['children'] = teamLang;
         }
+        if(!task.canAssignTo && typeof result[0] == 'object')
+        {
+            let taskAssignTo = typeof this.props.userMap[task.assignedTo] != undefined ? this.props.userMap[task.assignedTo] : task.assignedTo;
+            result[0] = {html: `<span class='text-center'>` + taskAssignTo + "</span>", className: 'flex mx-auto'};
+        }
     }
 
     if(['estimate', 'consumed','left'].includes(info.col.name) && result) result[0] = {html: result[0] + ' h'};
diff --git a/module/execution/ui/task.html.php b/module/execution/ui/task.html.php
index 1a4eb9ae1e..7244ce259e 100644
--- a/module/execution/ui/task.html.php
+++ b/module/execution/ui/task.html.php
@@ -58,10 +58,12 @@ if($execution->type != 'stage') unset($cols['design']);
 
 $tableData = initTableData($tasks, $cols, $this->task);
 $lang->task->statusList['changed'] = $lang->my->storyChanged;
+$canAssignTo = common::hasPriv('task', 'assignTo');
 foreach($tableData as $task)
 {
-    $task->rawStatus = $task->status;
-    $task->status    = $this->processStatus('task', $task);
+    $task->rawStatus   = $task->status;
+    $task->status      = $this->processStatus('task', $task);
+    $task->canAssignTo = $canAssignTo ? common::hasDBPriv($task, 'task', 'assignTo') : false;
     if(helper::isZeroDate($task->deadline))   $task->deadline   = '';
     if(helper::isZeroDate($task->estStarted)) $task->estStarted = '';
 }