From 444848876759173ad80203129250d2f0311f30fc Mon Sep 17 00:00:00 2001 From: Romulus Urakagi Tsai Date: Fri, 8 May 2020 09:32:19 +0800 Subject: Done attachments activities operating --- models/activities.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'models/activities.js') diff --git a/models/activities.js b/models/activities.js index 19e3fb7d..3f8a0d35 100644 --- a/models/activities.js +++ b/models/activities.js @@ -214,7 +214,11 @@ if (Meteor.isServer) { } if (activity.attachmentId) { const attachment = activity.attachment(); - params.attachment = attachment.original.name; + if (attachment.original) { + params.attachment = attachment.original.name; + } else { + params.attachment = attachment.versions.original.name; + } params.attachmentId = attachment._id; } if (activity.checklistId) { -- cgit v1.2.3-1-g7c22 From 012ca39a8dc29517aef191e85325f3e5889daf37 Mon Sep 17 00:00:00 2001 From: Romulus Urakagi Tsai Date: Fri, 8 May 2020 11:50:43 +0800 Subject: Attachment activities merging done --- models/activities.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'models/activities.js') diff --git a/models/activities.js b/models/activities.js index df207bca..2663dd29 100644 --- a/models/activities.js +++ b/models/activities.js @@ -217,11 +217,7 @@ if (Meteor.isServer) { } if (activity.attachmentId) { const attachment = activity.attachment(); - if (attachment.original) { - params.attachment = attachment.original.name; - } else { - params.attachment = attachment.versions.original.name; - } + params.attachment = attachment.name; params.attachmentId = attachment._id; } if (activity.checklistId) { -- cgit v1.2.3-1-g7c22