##// END OF EJS Templates
Added filename header when sending an image inline...
Jean-Philippe Lang -
r547:4cf1b6896938
parent child
Show More
@@ -1,44 +1,44
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2007 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class AttachmentsController < ApplicationController
19 19 layout 'base'
20 20 before_filter :find_project, :check_project_privacy
21 21
22 22 # sends an attachment
23 23 def download
24 24 send_file @attachment.diskfile, :filename => @attachment.filename
25 25 rescue
26 26 render_404
27 27 end
28 28
29 29 # sends an image to be displayed inline
30 30 def show
31 31 render(:nothing => true, :status => 404) and return unless @attachment.diskfile =~ /\.(jpeg|jpg|gif|png)$/i
32 send_file @attachment.diskfile, :type => "image/#{$1}", :disposition => 'inline'
32 send_file @attachment.diskfile, :filename => @attachment.filename, :type => "image/#{$1}", :disposition => 'inline'
33 33 rescue
34 34 render_404
35 35 end
36 36
37 37 private
38 38 def find_project
39 39 @attachment = Attachment.find(params[:id])
40 40 @project = @attachment.project
41 41 rescue
42 42 render_404
43 43 end
44 44 end
General Comments 0
You need to be logged in to leave comments. Login now