mirror of
https://github.com/wekan/wekan.git
synced 2026-03-01 03:10:16 +01:00
- Remove avatar url fix javascript version, it breaks too easily.
Same can be done with Caddy. Thanks to xet7 ! Closes #1776, closes #386
This commit is contained in:
parent
d2c3ecdbcd
commit
dfd26e4843
3 changed files with 1 additions and 16 deletions
|
|
@ -15,14 +15,6 @@ Add Caddy plugins:
|
||||||
Add configuring webhooks:
|
Add configuring webhooks:
|
||||||
- [Make the attributes that the webhook sends configurable](https://github.com/wekan/wekan/pull/1852).
|
- [Make the attributes that the webhook sends configurable](https://github.com/wekan/wekan/pull/1852).
|
||||||
|
|
||||||
and fixes the following bugs:
|
|
||||||
|
|
||||||
- [Remove suburl from beginning of avatar file path](https://github.com/wekan/wekan/issues/1776),
|
|
||||||
so that avatar images 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](https://github.com/wekan/wekan/commit/7e0bc1e33aef6dc0de11a595b81854623b417572).
|
|
||||||
|
|
||||||
Thanks to Caddy contributors, and Github users omarsy and xet7 for their contributions.
|
Thanks to Caddy contributors, and Github users omarsy and xet7 for their contributions.
|
||||||
|
|
||||||
# v1.34 2018-08-22 Wekan release
|
# v1.34 2018-08-22 Wekan release
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
template(name="userAvatar")
|
template(name="userAvatar")
|
||||||
a.member.js-member(title="{{userData.profile.fullname}} ({{userData.username}})")
|
a.member.js-member(title="{{userData.profile.fullname}} ({{userData.username}})")
|
||||||
if userData.profile.avatarUrl
|
if userData.profile.avatarUrl
|
||||||
img.avatar.avatar-image(src="{{fixAvatarUrl userData.profile.avatarUrl}}")
|
img.avatar.avatar-image(src="{{userData.profile.avatarUrl}}")
|
||||||
else
|
else
|
||||||
+userAvatarInitials(userId=userData._id)
|
+userAvatarInitials(userId=userData._id)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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() {
|
memberType() {
|
||||||
const user = Users.findOne(this.userId);
|
const user = Users.findOne(this.userId);
|
||||||
return user && user.isBoardAdmin() ? 'admin' : 'normal';
|
return user && user.isBoardAdmin() ? 'admin' : 'normal';
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue