diff options
| author | Mark Longair <mhl@pobox.com> | 2013-12-05 11:13:35 +0000 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-12-05 11:13:35 +0000 |
| commit | 14b8185e8051779a1ba500fe31bd2eb08c89edae (patch) | |
| tree | fd30ca38ba53d6cde41ea8728c6442e46571db22 | |
| parent | 40ae8e321531d6da35d28ebba2bd5db9a5d81b2a (diff) | |
| parent | 0bb7893e3691da1afbfb0954872b42ce030f5de6 (diff) | |
Merge remote-tracking branch 'origin/feature/cleaner-attachment-image-path' into rails-3-develop
| -rw-r--r-- | app/views/request/_bubble.html.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/request/_bubble.html.erb b/app/views/request/_bubble.html.erb index 8827d114d..e038bb3dc 100644 --- a/app/views/request/_bubble.html.erb +++ b/app/views/request/_bubble.html.erb @@ -13,7 +13,7 @@ :file_name => a.display_filename + '.html') %> <% img_filename = "icon_" + a.content_type.sub('/', '_') + "_large.png" - full_filename = File.expand_path(File.join(File.dirname(__FILE__), "../../assets/images", img_filename)) + full_filename = File.expand_path(Rails.root.join('app', 'assets', 'images', img_filename)) if File.exist?(full_filename) %> <%= link_to image_tag(img_filename, :class => "attachment_image", :alt => "Attachment"), attachment_path %> <% else %> |