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 !
This commit is contained in:
Lauri Ojansivu 2017-12-02 22:20:44 +02:00
commit 4c5eda0ae5
4 changed files with 12 additions and 5 deletions

View file

@ -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

View file

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

View file

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

View file

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