kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adds a named route for thumbnails and use route helper in #thumbnail_tag. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11188 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-01-14 20:51:49 +00:00
parent 4ebdcf13db
commit 6ce28450c0
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@ -160,8 +160,8 @@ module ApplicationHelper
end end
def thumbnail_tag(attachment) def thumbnail_tag(attachment)
link_to image_tag(url_for(:controller => 'attachments', :action => 'thumbnail', :id => attachment)), link_to image_tag(thumbnail_path(attachment)),
{:controller => 'attachments', :action => 'show', :id => attachment, :filename => attachment.filename}, named_attachment_path(attachment, attachment.filename),
:title => attachment.filename :title => attachment.filename
end end

2
config/routes.rb
View File

@ -260,7 +260,7 @@ RedmineApp::Application.routes.draw do
get 'attachments/:id/:filename', :to => 'attachments#show', :id => /\d+/, :filename => /.*/, :as => 'named_attachment' get 'attachments/:id/:filename', :to => 'attachments#show', :id => /\d+/, :filename => /.*/, :as => 'named_attachment'
get 'attachments/download/:id/:filename', :to => 'attachments#download', :id => /\d+/, :filename => /.*/, :as => 'download_named_attachment' get 'attachments/download/:id/:filename', :to => 'attachments#download', :id => /\d+/, :filename => /.*/, :as => 'download_named_attachment'
get 'attachments/download/:id', :to => 'attachments#download', :id => /\d+/ get 'attachments/download/:id', :to => 'attachments#download', :id => /\d+/
get 'attachments/thumbnail/:id(/:size)', :to => 'attachments#thumbnail', :id => /\d+/, :size => /\d+/ get 'attachments/thumbnail/:id(/:size)', :to => 'attachments#thumbnail', :id => /\d+/, :size => /\d+/, :as => 'thumbnail'
resources :attachments, :only => [:show, :destroy] resources :attachments, :only => [:show, :destroy]
resources :groups do resources :groups do

6
test/unit/helpers/application_helper_test.rb
View File

@ -1077,6 +1077,12 @@ RAW
link_to_attachment(a, :only_path => false) link_to_attachment(a, :only_path => false)
end end
def test_thumbnail_tag
a = Attachment.find(3)
assert_equal '<a href="/attachments/3/logo.gif" title="logo.gif"><img alt="3" src="/attachments/thumbnail/3" /></a>',
thumbnail_tag(a)
end
def test_link_to_project def test_link_to_project
project = Project.find(1) project = Project.find(1)
assert_equal %(<a href="/projects/ecookbook">eCookbook</a>), assert_equal %(<a href="/projects/ecookbook">eCookbook</a>),