Skip to content

O
OHR Support
Commit d77c1d28 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

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
parent e833cab3
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 5 deletions
app/controllers/attachments_controller.rb
View file @ d77c1d28
...@@ -19,19 +19,26 @@ class AttachmentsController < ApplicationController ...@@ -19,19 +19,26 @@ class AttachmentsController < ApplicationController
layout 'base' layout 'base'
before_filter :find_project, :check_project_privacy 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 def download
# images are sent inline # images are sent inline
send_file @attachment.diskfile, :filename => filename_for_content_disposition(@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
# in case the disk file was deleted
render_404
end end
private private
def find_project def find_project
@attachment = Attachment.find(params[:id]) @attachment = Attachment.find(params[:id])
render_404 and return false unless File.readable?(@attachment.diskfile)
@project = @attachment.project @project = @attachment.project
rescue rescue
render_404 render_404
......
app/helpers/attachments_helper.rb
View file @ d77c1d28
...@@ -22,4 +22,8 @@ module AttachmentsHelper ...@@ -22,4 +22,8 @@ module AttachmentsHelper
render :partial => 'attachments/links', :locals => {:attachments => attachments, :options => options} render :partial => 'attachments/links', :locals => {:attachments => attachments, :options => options}
end end
end end
def to_utf8(str)
str
end
end end
app/helpers/issues_helper.rb
View file @ d77c1d28
...@@ -91,7 +91,7 @@ module IssuesHelper ...@@ -91,7 +91,7 @@ module IssuesHelper
old_value = content_tag("strike", old_value) if detail.old_value and (!detail.value or detail.value.empty?) old_value = content_tag("strike", old_value) if detail.old_value and (!detail.value or detail.value.empty?)
if detail.property == 'attachment' && !value.blank? && Attachment.find_by_id(detail.prop_key) if detail.property == 'attachment' && !value.blank? && Attachment.find_by_id(detail.prop_key)
# Link to the attachment if it has not been removed # Link to the attachment if it has not been removed
value = link_to(value, :controller => 'attachments', :action => 'download', :id => detail.prop_key) value = link_to(value, :controller => 'attachments', :action => 'show', :id => detail.prop_key)
else else
value = content_tag("i", h(value)) if value value = content_tag("i", h(value)) if value
end end
......
app/models/attachment.rb
View file @ d77c1d28
...@@ -88,6 +88,10 @@ class Attachment < ActiveRecord::Base ...@@ -88,6 +88,10 @@ class Attachment < ActiveRecord::Base
self.filename =~ /\.(jpe?g|gif|png)$/i self.filename =~ /\.(jpe?g|gif|png)$/i
end end
def is_diff?
self.filename =~ /\.(patch|diff)$/i
end
private private
def sanitize_filename(value) def sanitize_filename(value)
# get only the filename, not the whole path # get only the filename, not the whole path
......
app/views/attachments/_links.rhtml
View file @ d77c1d28
<div class="attachments"> <div class="attachments">
<% for attachment in attachments %> <% for attachment in attachments %>
<p><%= link_to attachment.filename, {:controller => 'attachments', :action => 'download', :id => attachment }, :class => 'icon icon-attachment' -%> <p><%= link_to attachment.filename, {:controller => 'attachments', :action => 'show', :id => attachment }, :class => 'icon icon-attachment' -%>
<%= h(" - #{attachment.description}") unless attachment.description.blank? %> <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
<span class="size">(<%= number_to_human_size attachment.filesize %>)</span> <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
<% if options[:delete_url] %> <% if options[:delete_url] %>
......
app/views/attachments/diff.rhtml 0 → 100644
View file @ d77c1d28
<h2><%=h @attachment.filename %></h2>
<div class="attachments">
<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
<span class="author"><%= @attachment.author %>, <%= format_time(@attachment.created_on) %></span></p>
<p><%= link_to l(:button_download), {:controller => 'attachments', :action => 'download', :id => @attachment } -%>
<span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
</div>
&nbsp;
<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
<% content_for :header_tags do -%>
<%= stylesheet_link_tag "scm" -%>
<% end -%>
config/routes.rb
View file @ d77c1d28
...@@ -31,6 +31,8 @@ ActionController::Routing::Routes.draw do |map| ...@@ -31,6 +31,8 @@ ActionController::Routing::Routes.draw do |map|
omap.repositories_entry 'repositories/annotate/:id/*path', :action => 'annotate' omap.repositories_entry 'repositories/annotate/:id/*path', :action => 'annotate'
end end
map.connect 'attachments/:id', :controller => 'attachments', :action => 'show'
# Allow downloading Web Service WSDL as a file with an extension # Allow downloading Web Service WSDL as a file with an extension
# instead of a file named 'wsdl' # instead of a file named 'wsdl'
map.connect ':controller/service.wsdl', :action => 'wsdl' map.connect ':controller/service.wsdl', :action => 'wsdl'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment