summaryrefslogtreecommitdiffstats
path: root/client/components/activities/activities.js
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2020-05-24 03:13:53 +0300
committerLauri Ojansivu <x@xet7.org>2020-05-24 03:13:53 +0300
commit055b5285328f495203a7e225fdecd04bcf5c8b32 (patch)
tree361621362801c5409a08d60f45ebedb9f1cf9c02 /client/components/activities/activities.js
parentfda392e662a842aa7e686ce13870c8adb35c35ab (diff)
parent921460db4031134db863e32101c0ad60a17416b5 (diff)
downloadwekan-055b5285328f495203a7e225fdecd04bcf5c8b32.tar.gz
wekan-055b5285328f495203a7e225fdecd04bcf5c8b32.tar.bz2
wekan-055b5285328f495203a7e225fdecd04bcf5c8b32.zip
Merge branch 'lib-change' of https://github.com/PDIS/wekan into
PDIS-lib-change
Diffstat (limited to 'client/components/activities/activities.js')
-rw-r--r--client/components/activities/activities.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js
index 5d356f6e..186200ec 100644
--- a/client/components/activities/activities.js
+++ b/client/components/activities/activities.js
@@ -152,17 +152,18 @@ BlazeComponent.extendComponent({
attachmentLink() {
const attachment = this.currentData().activity.attachment();
+ const link = attachment.link('original', '/');
// trying to display url before file is stored generates js errors
return (
(attachment &&
- attachment.url({ download: true }) &&
+ link &&
Blaze.toHTML(
HTML.A(
{
- href: attachment.url({ download: true }),
+ href: link,
target: '_blank',
},
- attachment.name(),
+ attachment.name,
),
)) ||
this.currentData().activity.attachmentName