diff --git a/module/execution/js/task.ui.js b/module/execution/js/task.ui.js index 324877aa2d..635cec68a1 100644 --- a/module/execution/js/task.ui.js +++ b/module/execution/js/task.ui.js @@ -170,7 +170,8 @@ window.renderCell = function(result, info) { if(task.mode == 'multi' && !task.assignedTo && !['done,closed'].includes(task.rawStatus)) { - result[0]['props']['children'][1]['props']['children'] = teamLang; + if(canAssignTo) result[0]['props']['children'][1]['props']['children'] = teamLang; + if(!canAssignTo) result[0] = teamLang; } if(typeof task.canAssignTo != 'undefined' && !task.canAssignTo && typeof result[0] == 'object') { diff --git a/module/execution/ui/task.html.php b/module/execution/ui/task.html.php index d2ad6b045e..8e45d4f2f5 100644 --- a/module/execution/ui/task.html.php +++ b/module/execution/ui/task.html.php @@ -16,10 +16,10 @@ namespace zin; if(empty($features['story'])) unset($lang->execution->featureBar['task']['needconfirm']); $queryMenuLink = createLink('execution', 'task', "executionID={$execution->id}&status=bySearch¶m={queryID}"); $isFromDoc = $from === 'doc'; -jsVar('isFromDoc', $isFromDoc); jsVar('blockID', $blockID); jsVar('isFromDoc', $isFromDoc); +jsVar('canAssignTo', common::canModify('execution', $execution) && hasPriv('task', 'assignTo')); if($isFromDoc) { $this->app->loadLang('doc');