diff options
Diffstat (limited to 'models')
-rw-r--r-- | models/cards.js | 2 | ||||
-rw-r--r-- | models/customFields.js | 10 | ||||
-rw-r--r-- | models/export.js | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/models/cards.js b/models/cards.js index c3bae400..2caecb46 100644 --- a/models/cards.js +++ b/models/cards.js @@ -476,7 +476,7 @@ Cards.helpers({ // get all definitions const definitions = CustomFields.find({ - boardId: this.boardId, + boardIds: {$in: [this.boardId]}, }).fetch(); // match right definition to each field diff --git a/models/customFields.js b/models/customFields.js index b7ad5467..79f96708 100644 --- a/models/customFields.js +++ b/models/customFields.js @@ -4,11 +4,11 @@ CustomFields = new Mongo.Collection('customFields'); * A custom field on a card in the board */ CustomFields.attachSchema(new SimpleSchema({ - boardId: { + boardIds: { /** * the ID of the board */ - type: String, + type: [String], }, name: { /** @@ -135,7 +135,7 @@ if (Meteor.isServer) { const paramBoardId = req.params.boardId; JsonRoutes.sendResult(res, { code: 200, - data: CustomFields.find({ boardId: paramBoardId }).map(function (cf) { + data: CustomFields.find({ boardIds: {$in: [paramBoardId]} }).map(function (cf) { return { _id: cf._id, name: cf.name, @@ -159,7 +159,7 @@ if (Meteor.isServer) { const paramCustomFieldId = req.params.customFieldId; JsonRoutes.sendResult(res, { code: 200, - data: CustomFields.findOne({ _id: paramCustomFieldId, boardId: paramBoardId }), + data: CustomFields.findOne({ _id: paramCustomFieldId, boardIds: {$in: [paramBoardId]} }), }); }); @@ -189,7 +189,7 @@ if (Meteor.isServer) { boardId: paramBoardId, }); - const customField = CustomFields.findOne({_id: id, boardId: paramBoardId }); + const customField = CustomFields.findOne({_id: id, boardIds: {$in: [paramBoardId]} }); customFieldCreation(req.body.authorId, customField); JsonRoutes.sendResult(res, { diff --git a/models/export.js b/models/export.js index 76f2da06..f281b34a 100644 --- a/models/export.js +++ b/models/export.js @@ -75,7 +75,7 @@ class Exporter { result.lists = Lists.find(byBoard, noBoardId).fetch(); result.cards = Cards.find(byBoardNoLinked, noBoardId).fetch(); result.swimlanes = Swimlanes.find(byBoard, noBoardId).fetch(); - result.customFields = CustomFields.find(byBoard, noBoardId).fetch(); + result.customFields = CustomFields.find({boardIds: {$in: [this.boardId]}}, {fields: {boardId: 0}}).fetch(); result.comments = CardComments.find(byBoard, noBoardId).fetch(); result.activities = Activities.find(byBoard, noBoardId).fetch(); result.rules = Rules.find(byBoard, noBoardId).fetch(); |