Non-ascii attachement filename fix for IE.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1053 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2008-01-10 22:42:41 +00:00
parent a39f655a7c
commit 941f9bf3dd
4 changed files with 10 additions and 3 deletions

View File

@ -196,4 +196,9 @@ class ApplicationController < ActionController::Base
end end
return tmp return tmp
end end
# Returns a string that can be used as filename value in Content-Disposition header
def filename_for_content_disposition(name)
request.env['HTTP_USER_AGENT'] =~ %r{MSIE} ? ERB::Util.url_encode(name) : name
end
end end

View File

@ -21,7 +21,7 @@ class AttachmentsController < ApplicationController
def download def download
# images are sent inline # images are sent inline
send_file @attachment.diskfile, :filename => @attachment.filename, send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
:type => @attachment.content_type, :type => @attachment.content_type,
:disposition => (@attachment.image? ? 'inline' : 'attachment') :disposition => (@attachment.image? ? 'inline' : 'attachment')
rescue rescue

View File

@ -67,7 +67,8 @@ class DocumentsController < ApplicationController
def download def download
@attachment = @document.attachments.find(params[:attachment_id]) @attachment = @document.attachments.find(params[:attachment_id])
@attachment.increment_download @attachment.increment_download
send_file @attachment.diskfile, :filename => @attachment.filename, :type => @attachment.content_type send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
:type => @attachment.content_type
rescue rescue
render_404 render_404
end end

View File

@ -42,7 +42,8 @@ class VersionsController < ApplicationController
def download def download
@attachment = @version.attachments.find(params[:attachment_id]) @attachment = @version.attachments.find(params[:attachment_id])
@attachment.increment_download @attachment.increment_download
send_file @attachment.diskfile, :filename => @attachment.filename, :type => @attachment.content_type send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
:type => @attachment.content_type
rescue rescue
render_404 render_404
end end