summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-12-02 22:07:56 +0200
committerLauri Ojansivu <x@xet7.org>2017-12-02 22:07:56 +0200
commit847843e51db0c1ec3911643d2b063a2e61864cf6 (patch)
treeedf3b0f1572b1ecf0c6d236e2d087bdb6633a54d
parent9261371c510dbc1f2d08890db072ccc96f4f6c1d (diff)
parent3dc326db6a2ffe258f4da33645abd3326275d156 (diff)
downloadwekan-847843e51db0c1ec3911643d2b063a2e61864cf6.tar.gz
wekan-847843e51db0c1ec3911643d2b063a2e61864cf6.tar.bz2
wekan-847843e51db0c1ec3911643d2b063a2e61864cf6.zip
Merge branch 'fix-bug-on-missing-admin-panel-menuoption' of https://github.com/thuanpq/wekan into thuanpq-fix-bug-on-missing-admin-panel-menuoption
-rw-r--r--client/components/boards/boardsList.js1
-rw-r--r--client/components/main/header.js2
-rw-r--r--client/components/users/userHeader.js10
3 files changed, 8 insertions, 5 deletions
diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js
index 6c9600a1..cc4e2f87 100644
--- a/client/components/boards/boardsList.js
+++ b/client/components/boards/boardsList.js
@@ -5,7 +5,6 @@ BlazeComponent.extendComponent({
// Here is the only place that boards data needed, all boards data will stop sync when leaving this template.
Meteor.subscribe('boards');
Meteor.subscribe('setting');
- Meteor.subscribe('user-admin');
},
boards() {
diff --git a/client/components/main/header.js b/client/components/main/header.js
index b005775a..3155b3d9 100644
--- a/client/components/main/header.js
+++ b/client/components/main/header.js
@@ -1,3 +1,5 @@
+Meteor.subscribe('user-admin');
+
Template.header.helpers({
wrappedHeader() {
return !Session.get('currentBoard');
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) {