Fall back to default_avatar_url in issue assigment.
This fixes the avatar in issue assignments when the user hasn't got an avatar and Gravatar is disabled. Closes #34733
This commit is contained in:
parent
94039bd7ca
commit
65497b5f65
|
@ -84,7 +84,7 @@ export default {
|
|||
return !this.showLess || (index < this.defaultRenderCount && this.showLess);
|
||||
},
|
||||
avatarUrl(user) {
|
||||
return user.avatar || user.avatar_url;
|
||||
return user.avatar || user.avatar_url || gon.default_avatar_url;
|
||||
},
|
||||
assigneeUrl(user) {
|
||||
return `${this.rootPath}${user.username}`;
|
||||
|
|
|
@ -492,7 +492,7 @@ function UsersSelect(currentUser, els, options = {}) {
|
|||
renderRow: function(user) {
|
||||
var avatar, img, listClosingTags, listWithName, listWithUserName, username;
|
||||
username = user.username ? "@" + user.username : "";
|
||||
avatar = user.avatar_url ? user.avatar_url : false;
|
||||
avatar = user.avatar_url ? user.avatar_url : gon.default_avatar_url;
|
||||
|
||||
let selected = false;
|
||||
|
||||
|
@ -513,9 +513,7 @@ function UsersSelect(currentUser, els, options = {}) {
|
|||
if (user.beforeDivider != null) {
|
||||
`<li><a href='#' class='${selected === true ? 'is-active' : ''}'>${_.escape(user.name)}</a></li>`;
|
||||
} else {
|
||||
if (avatar) {
|
||||
img = "<img src='" + avatar + "' class='avatar avatar-inline' width='32' />";
|
||||
}
|
||||
img = "<img src='" + avatar + "' class='avatar avatar-inline' width='32' />";
|
||||
}
|
||||
|
||||
return `
|
||||
|
|
Loading…
Reference in New Issue