diff options
author | Phil Hughes <me@iamphill.com> | 2017-04-28 13:27:52 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-04-28 13:27:52 +0300 |
commit | 79d50538c4c633dd35b6182ba4d08d4eba7576fc (patch) | |
tree | c4918e46d4f325ae82fd28aaf9bd3f4a06874070 /app/assets/javascripts/boards | |
parent | ef518df28adc1366d868cb990952e87f60e8b0eb (diff) |
Fixed avatar not displaying in issue boards
This happens when Gravatar is disabled in the admin settings, the avatar is returned as null & then frontend didn't do anything about it.
Closes #31428
Diffstat (limited to 'app/assets/javascripts/boards')
-rw-r--r-- | app/assets/javascripts/boards/models/user.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/boards/utils/default_avatar.js | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/models/user.js b/app/assets/javascripts/boards/models/user.js index 8e9de4d4cbb..875c21a37d3 100644 --- a/app/assets/javascripts/boards/models/user.js +++ b/app/assets/javascripts/boards/models/user.js @@ -1,11 +1,12 @@ /* eslint-disable no-unused-vars */ +import defaultAvatar from '../utils/default_avatar'; class ListUser { constructor(user) { this.id = user.id; this.name = user.name; this.username = user.username; - this.avatar = user.avatar_url; + this.avatar = user.avatar_url || defaultAvatar(); } } diff --git a/app/assets/javascripts/boards/utils/default_avatar.js b/app/assets/javascripts/boards/utils/default_avatar.js new file mode 100644 index 00000000000..062ffec6dce --- /dev/null +++ b/app/assets/javascripts/boards/utils/default_avatar.js @@ -0,0 +1 @@ +export default () => document.getElementById('board-app').dataset.defaultAvatar; |