From ef0c729b27ac9da4d2c3928c6bc2fa6e1e25ed18 Mon Sep 17 00:00:00 2001 From: nztqa Date: Tue, 27 Jun 2017 11:37:16 +0900 Subject: Fix: incorrect attachment link with subfolder in the url --- client/components/activities/activities.js | 2 +- client/components/cards/attachments.jade | 4 ++-- client/components/cards/minicard.jade | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index 6600849c..ccb064f3 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -86,7 +86,7 @@ BlazeComponent.extendComponent({ const attachment = this.currentData().attachment(); // 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 })), + href: attachment.url({ download: true }), target: '_blank', }, attachment.name())); }, diff --git a/client/components/cards/attachments.jade b/client/components/cards/attachments.jade index da728114..e35b364a 100644 --- a/client/components/cards/attachments.jade +++ b/client/components/cards/attachments.jade @@ -12,7 +12,7 @@ template(name="previewClipboardImagePopup") button.primary.js-upload-pasted-image {{_ 'upload'}} template(name="previewAttachedImagePopup") - img.preview-large-image.js-large-image-clicked(src="{{pathFor url}}") + img.preview-large-image.js-large-image-clicked(src="{{url}}") template(name="attachmentDeletePopup") p {{_ "attachment-delete-pop"}} @@ -25,7 +25,7 @@ template(name="attachmentsGalery") .attachment-thumbnail if isUploaded if isImage - img.attachment-thumbnail-img.js-preview-image(src="{{pathFor url}}") + img.attachment-thumbnail-img.js-preview-image(src="{{url}}") else span.attachment-thumbnail-ext= extension else diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index 5409ec62..6fd83386 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -1,7 +1,7 @@ template(name="minicard") .minicard if cover - .minicard-cover(style="background-image: url('{{pathFor cover.url}}');") + .minicard-cover(style="background-image: url('{{cover.url}}');") if labels .minicard-labels each labels -- cgit v1.2.3-1-g7c22 From c5381d30ed851fccfdcf8fa124c075c8aedca6fc Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 27 Jun 2017 10:49:11 +0300 Subject: Fix incorrect attachment link with subfolder in the url. Thanks to nztqa ! Closes #1015 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73e44e7e..dabb6200 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +* [Fix incorrect attachment link with subfolder in the url](https://github.com/wekan/wekan/pull/1086); + +Thanks to GitHub user nztqa for contributions. + # v0.26 2017-06-26 Wekan release This release fixes the following bugs: -- cgit v1.2.3-1-g7c22