diff options
author | Felix Geyer <debfx@fobos.de> | 2018-01-24 01:29:20 +0300 |
---|---|---|
committer | Felix Geyer <debfx@fobos.de> | 2018-01-28 19:39:28 +0300 |
commit | 65497b5f65ac115bb0219e83523f192fd51c91f2 (patch) | |
tree | eb5610bc23701635583e91ea376c995422448ed5 /app | |
parent | 94039bd7ca750446c637b924547493cfe8143716 (diff) |
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
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/sidebar/components/assignees/assignees.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/users_select.js | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/sidebar/components/assignees/assignees.js b/app/assets/javascripts/sidebar/components/assignees/assignees.js index 7e5feac622c..643877b9d47 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignees.js +++ b/app/assets/javascripts/sidebar/components/assignees/assignees.js @@ -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}`; diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index f249bd036d6..ab108906732 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -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 ` |