Unified diff viewer for attached files with .patch or .diff extension (#1403).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1516 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2008-06-08 18:26:39 +00:00
parent e833cab30e
commit d77c1d2829
7 changed files with 37 additions and 5 deletions
+10 -3
View File
@@ -19,19 +19,26 @@ class AttachmentsController < ApplicationController
layout 'base'
before_filter :find_project, :check_project_privacy
def show
if @attachment.is_diff?
@diff = File.new(@attachment.diskfile, "rb").read
render :action => 'diff'
else
download
end
end
def download
# images are sent inline
send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
:type => @attachment.content_type,
:disposition => (@attachment.image? ? 'inline' : 'attachment')
rescue
# in case the disk file was deleted
render_404
end
private
def find_project
@attachment = Attachment.find(params[:id])
render_404 and return false unless File.readable?(@attachment.diskfile)
@project = @attachment.project
rescue
render_404