diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-03-20 23:50:43 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-03-20 23:50:43 +0200 |
| commit | d5d33247fb642794be39098789b3b14e207ce832 (patch) | |
| tree | 021a701fcbff6e24df4421d3f431912bb13af56a | |
| parent | 9f95a1059191be699e2581807704bd987f3843f9 (diff) | |
| parent | a6e3c8984d76d56d0803c67c6e857d052e892aa6 (diff) | |
| download | wekan-d5d33247fb642794be39098789b3b14e207ce832.tar.gz wekan-d5d33247fb642794be39098789b3b14e207ce832.tar.bz2 wekan-d5d33247fb642794be39098789b3b14e207ce832.zip | |
Merge branch 'fix_subtasks' of https://github.com/andresmanelli/wekan into andresmanelli-fix_subtasks
| -rw-r--r-- | models/boards.js | 4 | ||||
| -rw-r--r-- | server/publications/boards.js | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/models/boards.js b/models/boards.js index 99ac8e6e..36651d54 100644 --- a/models/boards.js +++ b/models/boards.js @@ -605,9 +605,7 @@ Boards.helpers({ title: TAPi18n.__('queue'), boardId: this._id, }); - Boards.update(this._id, {$set: { - subtasksDefaultListId: this.subtasksDefaultListId, - }}); + this.setSubtasksDefaultListId(this.subtasksDefaultListId); } return this.subtasksDefaultListId; }, diff --git a/server/publications/boards.js b/server/publications/boards.js index 6d9d2b9e..144eabb8 100644 --- a/server/publications/boards.js +++ b/server/publications/boards.js @@ -116,7 +116,7 @@ Meteor.publishRelations('board', function(boardId) { const boards = this.join(Boards); const subCards = this.join(Cards); - this.cursor(Cards.find({ boardId }), function(cardId, card) { + this.cursor(Cards.find({ boardId: {$in: [boardId, board.subtasksDefaultBoardId]}}), function(cardId, card) { if (card.type === 'cardType-linkedCard') { const impCardId = card.linkedId; subCards.push(impCardId); @@ -141,6 +141,7 @@ Meteor.publishRelations('board', function(boardId) { checklists.send(); checklistItems.send(); boards.send(); + parentCards.send(); if (board.members) { // Board members. This publication also includes former board members that |