summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorAndrés Manelli <andresmanelli@gmail.com>2018-05-02 15:11:26 -0300
committerAndrés Manelli <andresmanelli@gmail.com>2018-08-11 00:17:42 +0200
commit692a1bc369314bc3f8464e2b7ae611775a07be6f (patch)
tree05ed998804638837bae08c3d75ecdd8840e95a14 /server
parentf76d8e47a859c64a99cfd460e3fd496965bf021a (diff)
downloadwekan-692a1bc369314bc3f8464e2b7ae611775a07be6f.tar.gz
wekan-692a1bc369314bc3f8464e2b7ae611775a07be6f.tar.bz2
wekan-692a1bc369314bc3f8464e2b7ae611775a07be6f.zip
Refactor imported -> linked in server and i18n
Diffstat (limited to 'server')
-rw-r--r--server/migrations.js2
-rw-r--r--server/publications/boards.js8
2 files changed, 5 insertions, 5 deletions
diff --git a/server/migrations.js b/server/migrations.js
index 32f24e4c..16fe225e 100644
--- a/server/migrations.js
+++ b/server/migrations.js
@@ -219,7 +219,7 @@ Migrations.add('add-card-types', () => {
{ _id: card._id },
{ $set: {
type: 'cardType-card',
- importedId: null } },
+ linkedId: null } },
noValidate
);
});
diff --git a/server/publications/boards.js b/server/publications/boards.js
index 1d95c3d9..b68f7360 100644
--- a/server/publications/boards.js
+++ b/server/publications/boards.js
@@ -99,16 +99,16 @@ Meteor.publishRelations('board', function(boardId) {
// And in the meantime our code below works pretty well -- it's not even a
// hack!
this.cursor(Cards.find({ boardId }), function(cardId, card) {
- if (card.type === 'cardType-importedCard') {
- const impCardId = card.importedId;
+ if (card.type === 'cardType-linkedCard') {
+ const impCardId = card.linkedId;
this.cursor(Cards.find({ _id: impCardId }));
this.cursor(CardComments.find({ cardId: impCardId }));
this.cursor(Activities.find({ cardId: impCardId }));
this.cursor(Attachments.find({ cardId: impCardId }));
this.cursor(Checklists.find({ cardId: impCardId }));
this.cursor(ChecklistItems.find({ cardId: impCardId }));
- } else if (card.type === 'cardType-importedBoard') {
- this.cursor(Boards.find({ _id: card.importedId}));
+ } else if (card.type === 'cardType-linkedBoard') {
+ this.cursor(Boards.find({ _id: card.linkedId}));
}
this.cursor(Activities.find({ cardId }));
this.cursor(CardComments.find({ cardId }));