Move In Progress ostrio-files changes to separate branch, and revert ostrio-files changes, so that:

- Export to CSV/TSV with custom fields works
- Attachments are not exported to disk
- It is possible to build arm64/s390x versions again.

Thanks to xet7 !

Related #3110

1 files changed, 5 insertions, 7 deletions

diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js
index 4f15d421..5d356f6e 100644
--- a/client/components/activities/activities.js
+++ b/client/components/activities/activities.js
@@ -151,23 +151,21 @@ BlazeComponent.extendComponent({
   },
 
   attachmentLink() {
-    const activity = this.currentData().activity;
-    const attachment = activity.attachment();
-    const link = attachment ? attachment.link('original', '/') : null;
+    const attachment = this.currentData().activity.attachment();
     // trying to display url before file is stored generates js errors
     return (
       (attachment &&
-        link &&
+        attachment.url({ download: true }) &&
         Blaze.toHTML(
           HTML.A(
             {
-              href: link,
+              href: attachment.url({ download: true }),
               target: '_blank',
             },
-            attachment.name,
+            attachment.name(),
           ),
         )) ||
-      activity.attachmentName
+      this.currentData().activity.attachmentName
     );
   },