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

* [task#133217,start,1h] check assignTo.

Browse Source
This commit is contained in:
liumengyi
2024-12-03 13:25:42 +08:00
committed by 田淑杰
parent 70723162c7
commit c60d923476
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/js/task.ui.js
+5
View File
@@ -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'};
module/execution/ui/task.html.php
+4 -2
View File
@@ -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 = '';
}