1 files changed, 17 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) => {