Commit 65497b5f authored by Felix Geyer's avatar Felix Geyer

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
parent 94039bd7
...@@ -84,7 +84,7 @@ export default { ...@@ -84,7 +84,7 @@ export default {
return !this.showLess || (index < this.defaultRenderCount && this.showLess); return !this.showLess || (index < this.defaultRenderCount && this.showLess);
}, },
avatarUrl(user) { avatarUrl(user) {
return user.avatar || user.avatar_url; return user.avatar || user.avatar_url || gon.default_avatar_url;
}, },
assigneeUrl(user) { assigneeUrl(user) {
return `${this.rootPath}${user.username}`; return `${this.rootPath}${user.username}`;
......
...@@ -492,7 +492,7 @@ function UsersSelect(currentUser, els, options = {}) { ...@@ -492,7 +492,7 @@ function UsersSelect(currentUser, els, options = {}) {
renderRow: function(user) { renderRow: function(user) {
var avatar, img, listClosingTags, listWithName, listWithUserName, username; var avatar, img, listClosingTags, listWithName, listWithUserName, username;
username = user.username ? "@" + user.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; let selected = false;
...@@ -513,10 +513,8 @@ function UsersSelect(currentUser, els, options = {}) { ...@@ -513,10 +513,8 @@ function UsersSelect(currentUser, els, options = {}) {
if (user.beforeDivider != null) { if (user.beforeDivider != null) {
`<li><a href='#' class='${selected === true ? 'is-active' : ''}'>${_.escape(user.name)}</a></li>`; `<li><a href='#' class='${selected === true ? 'is-active' : ''}'>${_.escape(user.name)}</a></li>`;
} else { } else {
if (avatar) {
img = "<img src='" + avatar + "' class='avatar avatar-inline' width='32' />"; img = "<img src='" + avatar + "' class='avatar avatar-inline' width='32' />";
} }
}
return ` return `
<li data-user-id=${user.id}> <li data-user-id=${user.id}>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment