Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-18 00:10:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix error on console when user logout (Part 1)

Browse source
This commit is contained in:
Martin Filser 2023-03-22 22:13:31 +01:00
parent b0c94f7ff2
commit 38a32824ea
2 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/components/boards/boardsList.js
View file

@ -151,8 +151,8 @@ BlazeComponent.extendComponent({
} }
const currUser = ReactiveCache.getCurrentUser(); const currUser = ReactiveCache.getCurrentUser();
let orgIdsUserBelongs = currUser !== undefined && currUser.teams !== 'undefined' ? currUser.orgIdsUserBelongs() : ''; let orgIdsUserBelongs = currUser?.orgIdsUserBelongs() || '';
if (orgIdsUserBelongs && orgIdsUserBelongs != '') { if (orgIdsUserBelongs) {
let orgsIds = orgIdsUserBelongs.split(','); let orgsIds = orgIdsUserBelongs.split(',');
// for(let i = 0; i < orgsIds.length; i++){ // for(let i = 0; i < orgsIds.length; i++){
// query.$and[2].$or.push({'orgs.orgId': orgsIds[i]}); // query.$and[2].$or.push({'orgs.orgId': orgsIds[i]});
@ -162,8 +162,8 @@ BlazeComponent.extendComponent({
query.$and[2].$or.push({ 'orgs.orgId': { $in: orgsIds } }); query.$and[2].$or.push({ 'orgs.orgId': { $in: orgsIds } });
} }
let teamIdsUserBelongs = currUser !== undefined && currUser.teams !== 'undefined' ? currUser.teamIdsUserBelongs() : ''; let teamIdsUserBelongs = currUser?.teamIdsUserBelongs() || '';
if (teamIdsUserBelongs && teamIdsUserBelongs != '') { if (teamIdsUserBelongs) {
let teamsIds = teamIdsUserBelongs.split(','); let teamsIds = teamIdsUserBelongs.split(',');
// for(let i = 0; i < teamsIds.length; i++){ // for(let i = 0; i < teamsIds.length; i++){
// query.$or[2].$or.push({'teams.teamId': teamsIds[i]}); // query.$or[2].$or.push({'teams.teamId': teamsIds[i]});

18
models/users.js
View file

@ -687,14 +687,11 @@ Users.helpers({
return ''; return '';
}, },
orgIdsUserBelongs() { orgIdsUserBelongs() {
let ret = '';
if (this.orgs) { if (this.orgs) {
return this.orgs ret = this.orgs.map(org => org.orgId).join(',');
.map(function (org) {
return org.orgId;
})
.join(',');
} }
return ''; return ret;
}, },
teamsUserBelongs() { teamsUserBelongs() {
if (this.teams) { if (this.teams) {
@ -708,14 +705,11 @@ Users.helpers({
return ''; return '';
}, },
teamIdsUserBelongs() { teamIdsUserBelongs() {
let ret = '';
if (this.teams) { if (this.teams) {
return this.teams ret = this.teams.map(team => team.teamId).join(',');
.map(function (team) {
return team.teamId;
})
.join(',');
} }
return ''; return ret;
}, },
boards() { boards() {
return Boards.userBoards(this._id, null, {}, { sort: { sort: 1 } }); return Boards.userBoards(this._id, null, {}, { sort: { sort: 1 } });