diff options
author | Ghassen Rjab <rjab.ghassen@gmail.com> | 2017-09-02 07:17:42 +0100 |
---|---|---|
committer | Ghassen Rjab <rjab.ghassen@gmail.com> | 2017-09-02 07:17:42 +0100 |
commit | 6ff0cf91e2fe6fd0e777225eb7afb3b37ac313e7 (patch) | |
tree | aadf4114a96c7954a9e78060e1708e07787e56c6 | |
parent | 4ad4c6ea2274919ced917e541120ad50c7512b80 (diff) | |
download | wekan-6ff0cf91e2fe6fd0e777225eb7afb3b37ac313e7.tar.gz wekan-6ff0cf91e2fe6fd0e777225eb7afb3b37ac313e7.tar.bz2 wekan-6ff0cf91e2fe6fd0e777225eb7afb3b37ac313e7.zip |
Add source field to imported attachments
We use this field to prevent adding attachments' related activities automatically only. Then this field will be removed.
-rw-r--r-- | models/attachments.js | 25 | ||||
-rw-r--r-- | models/trelloCreator.js | 3 | ||||
-rw-r--r-- | models/wekanCreator.js | 6 |
3 files changed, 26 insertions, 8 deletions
diff --git a/models/attachments.js b/models/attachments.js index 3e5d4437..40adda49 100644 --- a/models/attachments.js +++ b/models/attachments.js @@ -55,14 +55,23 @@ if (Meteor.isServer) { if (Meteor.isServer) { Attachments.files.after.insert((userId, doc) => { - Activities.insert({ - userId, - type: 'card', - activityType: 'addAttachment', - attachmentId: doc._id, - boardId: doc.boardId, - cardId: doc.cardId, - }); + // If the attachment doesn't have a source field + // or its source is different than import + if (!doc.source || doc.source !== 'import') { + // Add activity about adding the attachment + Activities.insert({ + userId, + type: 'card', + activityType: 'addAttachment', + attachmentId: doc._id, + boardId: doc.boardId, + cardId: doc.cardId, + }); + } else { + // Don't add activity about adding the attachment as the activity + // be imported and delete source field + Attachments.update( {_id: doc._id} , {$unset: { source : "" } } ); + } }); Attachments.files.after.remove((userId, doc) => { diff --git a/models/trelloCreator.js b/models/trelloCreator.js index 44030ea5..b0e3325b 100644 --- a/models/trelloCreator.js +++ b/models/trelloCreator.js @@ -323,6 +323,9 @@ export class TrelloCreator { file.boardId = boardId; file.cardId = cardId; file.userId = this._user(att.idMemberCreator); + // The field source will only be used to prevent adding + // attachments' related activities automatically + file.source = 'import'; if (error) { throw(error); } else { diff --git a/models/wekanCreator.js b/models/wekanCreator.js index d96ad2ca..3d0a2397 100644 --- a/models/wekanCreator.js +++ b/models/wekanCreator.js @@ -313,6 +313,9 @@ export class WekanCreator { file.boardId = boardId; file.cardId = cardId; file.userId = this._user(att.userId); + // The field source will only be used to prevent adding + // attachments' related activities automatically + file.source = 'import'; if (error) { throw(error); } else { @@ -332,6 +335,9 @@ export class WekanCreator { file.boardId = boardId; file.cardId = cardId; file.userId = this._user(att.userId); + // The field source will only be used to prevent adding + // attachments' related activities automatically + file.source = 'import'; if (error) { throw(error); } else { |