Merge branch 'thuanpq-fix-bug-on-missing-admin-panel-menuoption' into devel

Fixed Bug on not being able to see Admin Panel if not having access to Board List.
Thanks to thuanpq !

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) {