summaryrefslogtreecommitdiffstats
path: root/client/components/cards
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-06-27 10:49:42 +0300
committerLauri Ojansivu <x@xet7.org>2017-06-27 10:49:42 +0300
commite7a58c764d97c98aca80438f66f0054b4dc7143e (patch)
tree065004f4643965c82d36f1eec77a0fdae835b073 /client/components/cards
parent8937f18423cafa770db9fb88225b74b775ec62a5 (diff)
parentc5381d30ed851fccfdcf8fa124c075c8aedca6fc (diff)
downloadwekan-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
Diffstat (limited to 'client/components/cards')
-rw-r--r--client/components/cards/attachments.jade4
-rw-r--r--client/components/cards/minicard.jade2
2 files changed, 3 insertions, 3 deletions
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