mirror of
https://github.com/wekan/wekan.git
synced 2025-04-24 14:08:31 -04:00
Merge branch 'nztqa-fix-wrong-links' into devel
Fix incorrect attachment link with subfolder in the url. Thanks to nztqa ! Closes #1015
This commit is contained in:
commit
e7a58c764d
4 changed files with 12 additions and 4 deletions
|
@ -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:
|
||||
|
|
|
@ -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()));
|
||||
},
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue