diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-06-27 10:49:42 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-06-27 10:49:42 +0300 |
| commit | e7a58c764d97c98aca80438f66f0054b4dc7143e (patch) | |
| tree | 065004f4643965c82d36f1eec77a0fdae835b073 | |
| parent | 8937f18423cafa770db9fb88225b74b775ec62a5 (diff) | |
| parent | c5381d30ed851fccfdcf8fa124c075c8aedca6fc (diff) | |
| download | wekan-e7a58c764d97c98aca80438f66f0054b4dc7143e.tar.gz wekan-e7a58c764d97c98aca80438f66f0054b4dc7143e.tar.bz2 wekan-e7a58c764d97c98aca80438f66f0054b4dc7143e.zip | |
Merge branch 'nztqa-fix-wrong-links' into devel
Fix incorrect attachment link with subfolder in the url.
Thanks to nztqa ! Closes #1015
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | client/components/activities/activities.js | 2 | ||||
| -rw-r--r-- | client/components/cards/attachments.jade | 4 | ||||
| -rw-r--r-- | client/components/cards/minicard.jade | 2 |
4 files changed, 12 insertions, 4 deletions
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: 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 |