Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-29 20:56:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'edge' into meteor-1.8

Browse source
This commit is contained in:
Lauri Ojansivu 2019-03-07 00:05:46 +02:00
commit 221831e4e5
5 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/components/cards/cardDetails.js
View file

@ -430,6 +430,7 @@ BlazeComponent.extendComponent({
const boards = Boards.find({
archived: false,
'members.userId': Meteor.userId(),
_id: {$ne: Meteor.user().getTemplatesBoardId()},
}, {
sort: ['title'],
});
@ -589,6 +590,9 @@ BlazeComponent.extendComponent({
const boards = Boards.find({
archived: false,
'members.userId': Meteor.userId(),
_id: {
$ne: Meteor.user().getTemplatesBoardId(),
},
}, {
sort: ['title'],
});
@ -596,8 +600,12 @@ BlazeComponent.extendComponent({
},
cards() {
const currentId = Session.get('currentCard');
if (this.parentBoard) {
return this.parentBoard.cards();
return Cards.find({
boardId: this.parentBoard,
_id: {$ne: currentId},
});
} else {
return [];
}