From ff0edfa042eb74789f19369feefdc47eb41ddeb2 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Tue, 24 May 2022 08:53:51 +0000 Subject: [PATCH 1/3] * Finish task #54981 #54982. --- module/execution/js/kanban.js | 12 ++++++------ module/execution/js/taskkanban.js | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index ccf3d875bb..0ccd87f0b6 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -394,7 +394,7 @@ function findDropColumns($element, $root) * @param {String|{account: string, avatar: string}} user User account or user object * @returns {string} */ -function renderUserAvatar(user, objectType, objectID, size) +function renderUserAvatar(user, objectType, objectID, size, objectStatus) { var avatarSizeClass = 'avatar-' + (size || 'sm'); var $noPrivAndNoAssigned = $('
'); @@ -414,7 +414,7 @@ function renderUserAvatar(user, objectType, objectID, size) var link = createLink('bug', 'assignto', 'id=' + objectID + '&kanbanGroup=' + groupBy, '', true); } - if(!user) return $(''); + if(!user) return objectStatus == 'closed' ? '' : $(''); if(typeof user === 'string') user = {account: user}; if(!user.avatar && window.userList && window.userList[user.account]) user = {avatar: userList[user.account].avatar, account: user.account, realname: userList[user.account].realname}; @@ -424,7 +424,7 @@ function renderUserAvatar(user, objectType, objectID, size) if(objectType == 'story' && !priv.canAssignStory) return $noPrivAvatar; if(objectType == 'bug' && !priv.canAssignBug) return $noPrivAvatar; - return $('').avatar({user: user}).attr('data-toggle', 'modal').attr('data-width', '80%'); + return objectStatus == 'closed' ? '' : $('').avatar({user: user}).attr('data-toggle', 'modal').attr('data-width', '80%'); } /** @@ -480,7 +480,7 @@ function renderStoryItem(item, $item, col) var idHtml = scaleSize <= 1 ? ('#' + item.id + '') : ''; var priHtml = '' + item.pri + ''; var hoursHtml = (item.estimate && scaleSize <= 1) ? ('' + item.estimate + 'h') : ''; - var avatarHtml = renderUserAvatar(item.assignedTo, 'story', item.id); + var avatarHtml = renderUserAvatar(item.assignedTo, 'story', item.id, '', col.type); var $infos = $item.find('.infos'); if(!$infos.length) $infos = $('
'); $infos.html([idHtml, priHtml, hoursHtml].join('')); @@ -542,7 +542,7 @@ function renderBugItem(item, $item, col) var idHtml = scaleSize <= 1 ? ('#' + item.id + '') : ''; var severityHtml = scaleSize <= 1 ? ('') : ''; var priHtml = '' + item.pri + ''; - var avatarHtml = renderUserAvatar(item.assignedTo, 'bug', item.id); + var avatarHtml = renderUserAvatar(item.assignedTo, 'bug', item.id, '', col.type); var $infos = $item.find('.infos'); if(!$infos.length) $infos = $('
'); @@ -605,7 +605,7 @@ function renderTaskItem(item, $item, col) { var priHtml = '' + item.pri + ''; var hoursHtml = scaleSize <= 1 && item.status != 'wait' ? ('' + taskLang.leftAB + ' ' + item.left + 'h') : ('' + taskLang.estimateAB + ' ' + item.estimate + 'h'); - var avatarHtml = renderUserAvatar(item.assignedTo, 'task', item.id); + var avatarHtml = renderUserAvatar(item.assignedTo, 'task', item.id, '', col.type); var $infos = $item.find('.infos'); if(!$infos.length) $infos = $('
'); diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js index 7fc942af01..956f2ebdc5 100644 --- a/module/execution/js/taskkanban.js +++ b/module/execution/js/taskkanban.js @@ -9,7 +9,7 @@ function changeView(view) * @param {String|{account: string, avatar: string}} user User account or user object * @returns {string} */ -function renderUserAvatar(user, objectType, objectID, size) +function renderUserAvatar(user, objectType, objectID, size, objectStatus) { var avatarSizeClass = 'avatar-' + (size || 'sm'); var $noPrivAndNoAssigned = $('
'); @@ -29,7 +29,7 @@ function renderUserAvatar(user, objectType, objectID, size) var link = createLink('bug', 'assignto', 'id=' + objectID, '', true); } - if(!user) return $(''); + if(!user) return objectStatus == 'closed' ? '' : $(''); if(typeof user === 'string') user = {account: user}; if(!user.avatar && window.userList && window.userList[user.account]) user = window.userList[user.account]; @@ -39,7 +39,7 @@ function renderUserAvatar(user, objectType, objectID, size) if(objectType == 'story' && !priv.canAssignStory) return $noPrivAvatar; if(objectType == 'bug' && !priv.canAssignBug) return $noPrivAvatar; - return $('').avatar({user: user}); + return objectStatus == 'closed' ? '' : $('').avatar({user: user}); } /** @@ -95,7 +95,7 @@ function renderStoryItem(item, $item, col) var idHtml = scaleSize <= 1 ? ('#' + item.id + '') : ''; var priHtml = '' + item.pri + ''; var hoursHtml = (item.estimate && scaleSize <= 1) ? ('' + item.estimate + 'h') : ''; - var avatarHtml = renderUserAvatar(item.assignedTo, 'story', item.id); + var avatarHtml = renderUserAvatar(item.assignedTo, 'story', item.id, '', col.type); var $infos = $item.find('.infos'); if(!$infos.length) $infos = $('
'); $infos.html([idHtml, priHtml, hoursHtml].join('')); @@ -157,7 +157,7 @@ function renderBugItem(item, $item, col) var idHtml = scaleSize <= 1 ? ('#' + item.id + '') : ''; var severityHtml = scaleSize <= 1 ? ('') : ''; var priHtml = '' + item.pri + ''; - var avatarHtml = renderUserAvatar(item.assignedTo, 'bug', item.id); + var avatarHtml = renderUserAvatar(item.assignedTo, 'bug', item.id, '', col.type); var $infos = $item.find('.infos'); if(!$infos.length) $infos = $('
'); @@ -220,7 +220,7 @@ function renderTaskItem(item, $item, col) { var priHtml = '' + item.pri + ''; var hoursHtml = scaleSize <= 1 && item.status != 'wait' ? ('' + taskLang.leftAB + ' ' + item.left + 'h') : ('' + taskLang.estimateAB + ' ' + item.estimate + 'h'); - var avatarHtml = renderUserAvatar(item.assignedTo, 'task', item.id); + var avatarHtml = renderUserAvatar(item.assignedTo, 'task', item.id, '', col.type); var $infos = $item.find('.infos'); if(!$infos.length) $infos = $('
'); From f7d41d2ddd779e651817c7fd86d2658dd2c66a26 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Tue, 24 May 2022 09:06:23 +0000 Subject: [PATCH 2/3] * Fix bug #22722. --- module/execution/lang/en.php | 2 +- module/execution/lang/zh-cn.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index f9bb7c45d1..4a72f760d9 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -380,7 +380,7 @@ $lang->execution->setTeam = 'Set Team'; $lang->execution->linkStory = 'Link Story'; $lang->execution->createTask = 'Create Task'; $lang->execution->goback = "Go Back Task List"; -$lang->execution->gobackExecution = "Go Back Executioni List"; +$lang->execution->gobackExecution = "Go Back {$lang->executionCommon} List"; $lang->execution->noweekend = 'Exclude Weekend'; $lang->execution->nodelay = 'Exclude Delay Date'; $lang->execution->withweekend = 'Include Weekend'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 5d248f81f0..41c647ddd6 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -380,7 +380,7 @@ $lang->execution->setTeam = '设置团队'; $lang->execution->linkStory = "关联{$lang->SRCommon}"; $lang->execution->createTask = '创建任务'; $lang->execution->goback = "返回任务列表"; -$lang->execution->gobackExecution = "返回迭代列表"; +$lang->execution->gobackExecution = "返回{$lang->executionCommon}列表"; $lang->execution->noweekend = '去除周末'; $lang->execution->nodelay = '去除延期日期'; $lang->execution->withweekend = '显示周末'; From 55ab5ee69d73bed5195a42376f0e3ae5e5d50cf6 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Wed, 25 May 2022 02:31:02 +0000 Subject: [PATCH 3/3] * Finish task #54981 #54982. --- module/execution/js/kanban.js | 10 ++++++++-- module/execution/js/taskkanban.js | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index 0ccd87f0b6..e61fc51a0b 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -391,8 +391,14 @@ function findDropColumns($element, $root) /** * Render user avatar - * @param {String|{account: string, avatar: string}} user User account or user object - * @returns {string} + * + * @param array $user + * @param string $objectType + * @param int $objectID + * @param int $size + * @param string $objectStatus + * @access public + * @return void */ function renderUserAvatar(user, objectType, objectID, size, objectStatus) { diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js index 956f2ebdc5..e952b470f0 100644 --- a/module/execution/js/taskkanban.js +++ b/module/execution/js/taskkanban.js @@ -6,8 +6,14 @@ function changeView(view) /** * Render user avatar - * @param {String|{account: string, avatar: string}} user User account or user object - * @returns {string} + * + * @param array $user + * @param string $objectType + * @param int $objectID + * @param int $size + * @param string $objectStatus + * @access public + * @return void */ function renderUserAvatar(user, objectType, objectID, size, objectStatus) {