diff options
author | Lauri Ojansivu <x@xet7.org> | 2020-05-25 17:54:51 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2020-05-25 17:54:51 +0300 |
commit | d52affe65893f17bab59bb43aa9f5afbb54993d3 (patch) | |
tree | 82b88066d4fb8efb6610ed77177d3747d34f0480 /client/components/activities/activities.js | |
parent | 23dcd084a49de4e6568527d8f97ed25adb04dafd (diff) | |
download | wekan-d52affe65893f17bab59bb43aa9f5afbb54993d3.tar.gz wekan-d52affe65893f17bab59bb43aa9f5afbb54993d3.tar.bz2 wekan-d52affe65893f17bab59bb43aa9f5afbb54993d3.zip |
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
Diffstat (limited to 'client/components/activities/activities.js')
-rw-r--r-- | client/components/activities/activities.js | 12 |
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 ); }, |