diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-12-12 14:32:37 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-12-12 14:32:37 +0200 |
commit | 047e22571e39d0459ce53c765fdb19060d71756d (patch) | |
tree | 8e255f5f187e69d3659781b3f7eb027f8a51bd4f /client/components/users | |
parent | ed95542b675aa34dee1c6eaafb1fb3a157215039 (diff) | |
parent | f115e33f6672bfe6fa625b190a01514f8aaa8870 (diff) | |
download | wekan-047e22571e39d0459ce53c765fdb19060d71756d.tar.gz wekan-047e22571e39d0459ce53c765fdb19060d71756d.tar.bz2 wekan-047e22571e39d0459ce53c765fdb19060d71756d.zip |
Merge branch 'devel'
Diffstat (limited to 'client/components/users')
-rw-r--r-- | client/components/users/userAvatar.js | 4 | ||||
-rw-r--r-- | client/components/users/userHeader.js | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/client/components/users/userAvatar.js b/client/components/users/userAvatar.js index 1066c632..be7a85d2 100644 --- a/client/components/users/userAvatar.js +++ b/client/components/users/userAvatar.js @@ -1,5 +1,3 @@ -Meteor.subscribe('my-avatars'); - Template.userAvatar.helpers({ userData() { // We need to handle a special case for the search results provided by the @@ -54,6 +52,8 @@ Template.userAvatarInitials.helpers({ BlazeComponent.extendComponent({ onCreated() { this.error = new ReactiveVar(''); + + Meteor.subscribe('my-avatars'); }, avatarUrlOptions() { diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index 481b13c3..f8a1c8b7 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -35,10 +35,12 @@ Template.editProfilePopup.events({ const email = tpl.find('.js-profile-email').value.trim(); let isChangeUserName = false; let isChangeEmail = false; - Users.update(Meteor.userId(), {$set: { - 'profile.fullname': fullname, - 'profile.initials': initials, - }}); + Users.update(Meteor.userId(), { + $set: { + 'profile.fullname': fullname, + 'profile.initials': initials, + }, + }); isChangeUserName = username !== Meteor.user().username; isChangeEmail = email.toLowerCase() !== Meteor.user().emails[0].address.toLowerCase(); if (isChangeUserName && isChangeEmail) { |