Download as
Browse Code »

Commit 3ea4bf4891d4d9aed994371a3a033db0e7bccbfa

Authored by Dmitriy Zaporozhets
2 parents 0401e195 b61f80ba
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

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
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
app/views/events/event/_note.html.haml
  Diff comments   View file @3ea4bf4
... ... @@ -14,8 +14,8 @@
14 14 - note = event.target
15 15 - if note.attachment.url
16 16 - if note.attachment.image?
17   - = link_to note.attachment.url, target: '_blank' do
18   - = image_tag note.attachment.url, class: 'note-image-attach'
  17 + = link_to note.attachment.secure_url, target: '_blank' do
  18 + = image_tag note.attachment.secure_url, class: 'note-image-attach'
19 19 - else
20 20 = link_to note.attachment.secure_url, target: "_blank", class: 'note-file-attach' do
21 21 %i.icon-paper-clip
... ...
app/views/projects/notes/_note.html.haml
  Diff comments   View file @3ea4bf4
... ... @@ -54,8 +54,8 @@
54 54 - if note.attachment.url
55 55 .note-attachment
56 56 - if note.attachment.image?
57   - = link_to note.attachment.url, target: '_blank' do
58   - = image_tag note.attachment.url, class: 'note-image-attach'
  57 + = link_to note.attachment.secure_url, target: '_blank' do
  58 + = image_tag note.attachment.secure_url, class: 'note-image-attach'
59 59 .attachment.pull-right
60 60 = link_to note.attachment.secure_url, target: "_blank" do
61 61 %i.icon-paper-clip
... ...