diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-08-22 23:58:47 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-08-22 23:58:47 +0300 |
commit | dfd26e4843028ab77bd103ed3c207f353eaad10f (patch) | |
tree | e20caf170311b54c550be1b29a03d3d5bbec2d01 /client/components | |
parent | d2c3ecdbcd6324f153dc6ab8d181c1634aea7c76 (diff) | |
download | wekan-dfd26e4843028ab77bd103ed3c207f353eaad10f.tar.gz wekan-dfd26e4843028ab77bd103ed3c207f353eaad10f.tar.bz2 wekan-dfd26e4843028ab77bd103ed3c207f353eaad10f.zip |
- Remove avatar url fix javascript version, it breaks too easily.
Same can be done with Caddy.
Thanks to xet7 !
Closes #1776,
closes #386
Diffstat (limited to 'client/components')
-rw-r--r-- | client/components/users/userAvatar.jade | 2 | ||||
-rw-r--r-- | client/components/users/userAvatar.js | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade index c61ade21..ebfa48ba 100644 --- a/client/components/users/userAvatar.jade +++ b/client/components/users/userAvatar.jade @@ -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="{{fixAvatarUrl userData.profile.avatarUrl}}") + img.avatar.avatar-image(src="{{userData.profile.avatarUrl}}") else +userAvatarInitials(userId=userData._id) diff --git a/client/components/users/userAvatar.js b/client/components/users/userAvatar.js index 4578d0b9..91cad237 100644 --- a/client/components/users/userAvatar.js +++ b/client/components/users/userAvatar.js @@ -14,13 +14,6 @@ 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'; |