diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-03-07 00:05:46 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-03-07 00:05:46 +0200 |
| commit | 221831e4e56705d5b9adf323d5f8fc645e5b86e3 (patch) | |
| tree | 04dda0cbf2436341496067bc91db80fa8ae5d4af /client | |
| parent | cb755af2ee7fe1845c8166a43075ddb1422b16ea (diff) | |
| parent | 1089572d664757da70ed3db981b6c752646b3c90 (diff) | |
| download | wekan-221831e4e56705d5b9adf323d5f8fc645e5b86e3.tar.gz wekan-221831e4e56705d5b9adf323d5f8fc645e5b86e3.tar.bz2 wekan-221831e4e56705d5b9adf323d5f8fc645e5b86e3.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client')
| -rw-r--r-- | client/components/cards/cardDetails.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 4df42586..9b47531f 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -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 []; } |