From cdfb23000599c4a7a9ef54c2a93ce3bd14a120ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Fri, 29 Oct 2021 10:07:59 +0800 Subject: [PATCH] * Add link to assignto. --- module/execution/js/kanban.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index d6baae7a31..8a419e2bb5 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -9,11 +9,20 @@ function changeView(view) * @param {String|{account: string, avatar: string}} user User account or user object * @returns {string} */ -function renderUserAvatar(user) +function renderUserAvatar(user, objectType, objectID) { if(typeof user === 'string') user = {account: user}; if(!user.avatar && window.userList && window.userList[user.account]) user = window.userList[user.account]; - return $('
').avatar({user: user}); + if(objectType == 'task') + { + var link = createLink('task', 'assignto', 'executionID=' + executionID + '&id=' + objectID, '', true); + } + else + { + var link = createLink(objectType, 'assignto', 'id=' + objectID, '', true); + } + + return $('').avatar({user: user}); } /** @@ -62,7 +71,7 @@ function renderStoryItem(item, $item, col) '' + item.pri + '', item.estimate ? '' + item.estimate + 'h' : '', ].join('')); - if(item.assignedTo) $infos.append(renderUserAvatar(item.assignedTo)); + if(item.assignedTo) $infos.append(renderUserAvatar(item.assignedTo, 'story', item.id)); var $actions = $item.find('.actions'); if(!$actions.length) @@ -111,7 +120,7 @@ function renderBugItem(item, $item, col) '' + item.pri + '', ].join('')); if(item.deadline) $infos.append(renderDeadline(item.deadline)); - if(item.assignedTo) $infos.append(renderUserAvatar(item.assignedTo)); + if(item.assignedTo) $infos.append(renderUserAvatar(item.assignedTo, 'bug', item.id)); var $actions = $item.find('.actions'); if(!$actions.length) @@ -160,7 +169,7 @@ function renderTaskItem(item, $item, col) item.estimate ? '' + item.estimate + 'h' : '', ].join('')); if(item.deadline) $infos.append(renderDeadline(item.deadline)); - if(item.assignedTo) $infos.append(renderUserAvatar(item.assignedTo)); + if(item.assignedTo) $infos.append(renderUserAvatar(item.assignedTo, 'task', item.id)); var $actions = $item.find('.actions'); if(!$actions.length)