summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrés Manelli <andresmanelli@gmail.com>2019-03-06 20:54:35 +0100
committerAndrés Manelli <andresmanelli@gmail.com>2019-03-06 20:57:19 +0100
commit745f39ed20169f56b99c0339f2043f8c4ed43873 (patch)
treee67c4f30d498557995245193e79da7b8c22607ac
parent18cccd514f90b7055bba4527cf81ecc8c20345ed (diff)
downloadwekan-745f39ed20169f56b99c0339f2043f8c4ed43873.tar.gz
wekan-745f39ed20169f56b99c0339f2043f8c4ed43873.tar.bz2
wekan-745f39ed20169f56b99c0339f2043f8c4ed43873.zip
Avoid setting same card as parentCard.
Avoid listing templates board in copy/move/more menus
-rw-r--r--client/components/cards/cardDetails.js10
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 [];
}