summaryrefslogtreecommitdiffstats
path: root/client/components/activities/activities.js
diff options
context:
space:
mode:
authorMaxime Quandalle <maxime@quandalle.com>2015-11-25 09:41:34 -0800
committerMaxime Quandalle <maxime@quandalle.com>2015-11-25 09:46:30 -0800
commitf565aed2596baaf9cd3da63110068177f7461e8e (patch)
tree6cfd70ebf5091925f7e9662029a0ca2135103120 /client/components/activities/activities.js
parent5763714d22c4533f173d1d34a1210acf548c4d58 (diff)
parentdb90771d9b1330eb8f7183c472545277b8ed9449 (diff)
downloadwekan-f565aed2596baaf9cd3da63110068177f7461e8e.tar.gz
wekan-f565aed2596baaf9cd3da63110068177f7461e8e.tar.bz2
wekan-f565aed2596baaf9cd3da63110068177f7461e8e.zip
Merge GitHub PR #401
I also completed the release notes related to the import feature. Closes #401
Diffstat (limited to 'client/components/activities/activities.js')
-rw-r--r--client/components/activities/activities.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js
index 64e9865d..c1465b04 100644
--- a/client/components/activities/activities.js
+++ b/client/components/activities/activities.js
@@ -86,7 +86,8 @@ BlazeComponent.extendComponent({
attachmentLink() {
const attachment = this.currentData().attachment();
- return attachment && Blaze.toHTML(HTML.A({
+ // trying to display url before file is stored generates js errors
+ return attachment && attachment.url({ download: true }) && Blaze.toHTML(HTML.A({
href: FlowRouter.path(attachment.url({ download: true })),
target: '_blank',
}, attachment.name()));