From 21d6cbd16081bc6520a5dc2c708917396aefe2e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Tue, 9 Nov 2021 14:24:49 +0800 Subject: [PATCH] * Fix logic error. --- module/execution/js/kanban.js | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index 23bcad2369..451f1bef31 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -11,9 +11,22 @@ function changeView(view) */ function renderUserAvatar(user, objectType, objectID) { - if(objectType == 'task') var link = createLink('task', 'assignto', 'executionID=' + executionID + '&id=' + objectID, '', true); - if(objectType == 'story') var link = createLink('story', 'assignto', 'id=' + objectID, '', true); - if(objectType == 'bug') var link = createLink('bug', 'assignto', 'id=' + objectID, '', true); + var $noPrivAndNoAssigned = $('
'); + if(objectType == 'task') + { + if(!priv.canAssignTask && !user) return $noPrivAndNoAssigned; + var link = createLink('task', 'assignto', 'executionID=' + executionID + '&id=' + objectID, '', true); + } + if(objectType == 'story') + { + if(!priv.canAssignStory && !user) return $noPrivAndNoAssigned; + var link = createLink('story', 'assignto', 'id=' + objectID, '', true); + } + if(objectType == 'bug') + { + if(!priv.canAssignBug && !user) return $noPrivAndNoAssigned; + var link = createLink('bug', 'assignto', 'id=' + objectID, '', true); + } if(!user) return $(''); @@ -21,9 +34,9 @@ function renderUserAvatar(user, objectType, objectID) if(!user.avatar && window.userList && window.userList[user.account]) user = window.userList[user.account]; var $noPrivAvatar = $('
').avatar({user: user}); - if(objectType == 'task' && !priv.canAssignTask) return $noPrivAvatar; - if(objectType == 'task' && !priv.canAssignStory) return $noPrivAvatar; - if(objectType == 'bug' && !priv.canAssignBug) return $noPrivAvatar; + if(objectType == 'task' && !priv.canAssignTask) return $noPrivAvatar; + if(objectType == 'story' && !priv.canAssignStory) return $noPrivAvatar; + if(objectType == 'bug' && !priv.canAssignBug) return $noPrivAvatar; return $('').avatar({user: user});