diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-13 13:29:54 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-13 13:29:54 +0400 |
| commit | 3ea4bf4891d4d9aed994371a3a033db0e7bccbfa (patch) | |
| tree | afd133d26f0f3d6df42a7dc8a97f8d860c704cca /app | |
| parent | 0401e19558b78aa16cd59ba384dd08dbb7634cba (diff) | |
| parent | b61f80babb10d0583d3199d557b4e8234d981a33 (diff) | |
Merge pull request #6045 from jacargentina/fix-4305
Temporary fix for #4305: Cant preview attached png images on notes; attachment.secure_url returns an url which is accessible
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/events/event/_note.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml index db5f3ebb00f..ad2afbce14c 100644 --- a/app/views/events/event/_note.html.haml +++ b/app/views/events/event/_note.html.haml @@ -14,8 +14,8 @@ - note = event.target - if note.attachment.url - if note.attachment.image? - = link_to note.attachment.url, target: '_blank' do - = image_tag note.attachment.url, class: 'note-image-attach' + = link_to note.attachment.secure_url, target: '_blank' do + = image_tag note.attachment.secure_url, class: 'note-image-attach' - else = link_to note.attachment.secure_url, target: "_blank", class: 'note-file-attach' do %i.icon-paper-clip diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 81bf0611ec6..2fd8cb6d489 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -54,8 +54,8 @@ - if note.attachment.url .note-attachment - if note.attachment.image? - = link_to note.attachment.url, target: '_blank' do - = image_tag note.attachment.url, class: 'note-image-attach' + = link_to note.attachment.secure_url, target: '_blank' do + = image_tag note.attachment.secure_url, class: 'note-image-attach' .attachment.pull-right = link_to note.attachment.secure_url, target: "_blank" do %i.icon-paper-clip |