From 6d9d18367460141b00f4e8e706e6294e0ba35675 Mon Sep 17 00:00:00 2001
From: Thuan Pham Quoc <thuanpq.io@gmail.com>
Date: Fri, 1 Dec 2017 15:04:35 +0700
Subject: Fixed - bug on not able to see ADMIN PANEL if not access Board List

---
 client/components/users/userHeader.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'client/components/users')

diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js
index 481b13c3..dbdee6a0 100644
--- a/client/components/users/userHeader.js
+++ b/client/components/users/userHeader.js
@@ -3,6 +3,12 @@ Template.headerUserBar.events({
   'click .js-change-avatar': Popup.open('changeAvatar'),
 });
 
+BlazeComponent.extendComponent({
+  onCreated() {
+    Meteor.subscribe('user-admin');
+  },
+}).register('memberMenuPopup');
+
 Template.memberMenuPopup.events({
   'click .js-edit-profile': Popup.open('editProfile'),
   'click .js-change-settings': Popup.open('changeSettings'),
@@ -35,10 +41,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) {
-- 
cgit v1.2.3-1-g7c22


From b3eab212aefc0012311cb59452c47a2627e5f472 Mon Sep 17 00:00:00 2001
From: Thuan Pham Quoc <thuanpq.io@gmail.com>
Date: Fri, 1 Dec 2017 15:15:44 +0700
Subject: Fixed - Missing trailing comma  comma-dangle

---
 client/components/users/userHeader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'client/components/users')

diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js
index dbdee6a0..ccb09148 100644
--- a/client/components/users/userHeader.js
+++ b/client/components/users/userHeader.js
@@ -45,7 +45,7 @@ Template.editProfilePopup.events({
       $set: {
         'profile.fullname': fullname,
         'profile.initials': initials,
-      }
+      },
     });
     isChangeUserName = username !== Meteor.user().username;
     isChangeEmail = email.toLowerCase() !== Meteor.user().emails[0].address.toLowerCase();
-- 
cgit v1.2.3-1-g7c22


From 3dc326db6a2ffe258f4da33645abd3326275d156 Mon Sep 17 00:00:00 2001
From: Thuan Pham Quoc <thuanpq.io@gmail.com>
Date: Fri, 1 Dec 2017 15:26:41 +0700
Subject: Move user-admin subsciption to header

---
 client/components/users/userHeader.js | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'client/components/users')

diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js
index ccb09148..f8a1c8b7 100644
--- a/client/components/users/userHeader.js
+++ b/client/components/users/userHeader.js
@@ -3,12 +3,6 @@ Template.headerUserBar.events({
   'click .js-change-avatar': Popup.open('changeAvatar'),
 });
 
-BlazeComponent.extendComponent({
-  onCreated() {
-    Meteor.subscribe('user-admin');
-  },
-}).register('memberMenuPopup');
-
 Template.memberMenuPopup.events({
   'click .js-edit-profile': Popup.open('editProfile'),
   'click .js-change-settings': Popup.open('changeSettings'),
-- 
cgit v1.2.3-1-g7c22


From 233554a3d69f1cf3a509e540fc1623d17c357037 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Sat, 2 Dec 2017 22:00:42 +0200
Subject: Move global subscription to template subscription so that
 subscription will stop when template is unused. It's very important for
 efficiency espacially with large number of users. Thanks to mfshiu !

---
 client/components/users/userAvatar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'client/components/users')

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() {
-- 
cgit v1.2.3-1-g7c22