github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-22 04:57:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix-bug-on-missing-admin-panel-menuoption' of https://github.com/thuanpq/wekan into thuanpq-fix-bug-on-missing-admin-panel-menuoption

Browse source
This commit is contained in:
Lauri Ojansivu 2017-12-02 22:07:56 +02:00
commit 847843e51d
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/components/boards/boardsList.js
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() {

2
client/components/main/header.js
View file

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

10
client/components/users/userHeader.js
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) {