Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-04 08:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Remove suburl from beginning of avatar file path, so that avatar images

Browse source 
don't get broken when root-url changes to different sub-url.
  This does not change avatar urls in database, instead this
  fixes url on the fly after loading avatar url from database.

Thanks to xet7 !

Closes #1776,
closes #386
This commit is contained in:
Lauri Ojansivu 2018-08-22 21:42:53 +03:00
parent 1b94b919fe
commit 7e0bc1e33a
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/components/users/userAvatar.jade
View file

@ -1,7 +1,7 @@
template(name="userAvatar")
a.member.js-member(title="{{userData.profile.fullname}} ({{userData.username}})")
if userData.profile.avatarUrl
img.avatar.avatar-image(src=userData.profile.avatarUrl)
img.avatar.avatar-image(src="{{fixAvatarUrl userData.profile.avatarUrl}}")
else
+userAvatarInitials(userId=userData._id)

7
client/components/users/userAvatar.js
View file

@ -14,6 +14,13 @@ Template.userAvatar.helpers({
});
},
fixAvatarUrl(avatarUrl) {
// Remove suburl from beginning of avatar file path,
// so that avatar images don't get broken when root-url changes to different sub-url.
avatarUrl = '/' + avatarUrl.substring(avatarUrl.indexOf('/cfs/files/avatars/')+1);
return avatarUrl;
},
memberType() {
const user = Users.findOne(this.userId);
return user && user.isBoardAdmin() ? 'admin' : 'normal';