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 = $('');