浏览代码

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 !
Lauri Ojansivu 7 年之前
父节点
当前提交
4c5eda0ae5
共有 4 个文件被更改,包括 12 次插入5 次删除
  1. 4 0
      CHANGELOG.md
  2. 0 1
      client/components/boards/boardsList.js
  3. 2 0
      client/components/main/header.js
  4. 6 4
      client/components/users/userHeader.js

+ 4 - 0
CHANGELOG.md

@@ -6,6 +6,10 @@ This release adds the following new features:
 * [Performance optimization: Move more global subscriptions to template subscription](https://github.com/wekan/wekan/pull/1373);
 * Update tranlations. Add Latvian language.
 
+and fixes the following bugs:
+
+* [Bug on not being able to see Admin Panel if not having access to Board List](https://github.com/wekan/wekan/pull/1371).
+
 Thanks to GitHub users mfshiu and thuanpq for their contributions. Thanks to translators for their translations.
 
 # v0.60 2017-11-29 Wekan release

+ 0 - 1
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() {

+ 2 - 0
client/components/main/header.js

@@ -1,3 +1,5 @@
+Meteor.subscribe('user-admin');
+
 Template.header.helpers({
   wrappedHeader() {
     return !Session.get('currentBoard');

+ 6 - 4
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) {