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