jro_apps/redmine Commit - r1502:d77c1d2829f9

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

Jean-Philippe Lang -

r1502:d77c1d2829f9

parent child

Context file:

r1502:d77c1d2829f9

app/views/attachments/diff.rhtml created 644 +15 0

@@ -0,0 +1,15
	1	<h2><%=h @attachment.filename %></h2>
	2
	3	<div class="attachments">
	4	<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
	5	<span class="author"><%= @attachment.author %>, <%= format_time(@attachment.created_on) %></span></p>
	6	<p><%= link_to l(:button_download), {:controller => 'attachments', :action => 'download', :id => @attachment } -%>
	7	<span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
	8
	9	</div>
	10
	11	<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
	12
	13	<% content_for :header_tags do -%>
	14	<%= stylesheet_link_tag "scm" -%>
	15	<% end -%>

app/controllers/attachments_controller.rb +10 -3

               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

app/helpers/attachments_helper.rb +4 0

                   render :partial => 'attachments/links', :locals => {:attachments => attachments, :options => options}
                 end
               end
+              def to_utf8(str)
+                str
+              end
             end

app/helpers/issues_helper.rb +1 -1

                   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)
                     # 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
                     value = content_tag("i", h(value)) if value
                   end

app/models/attachment.rb +4 0

                 self.filename =~ /\.(jpe?g|gif|png)$/i
               end
+              def is_diff?
+                self.filename =~ /\.(patch|diff)$/i
+              end
             private
               def sanitize_filename(value)
                 # get only the filename, not the whole path

app/views/attachments/_links.rhtml +1 -1

             <div class="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? %>
               <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
               <% if options[:delete_url] %>

config/routes.rb +2 0

                 omap.repositories_entry 'repositories/annotate/:id/*path', :action => 'annotate'
               end
+              map.connect 'attachments/:id', :controller => 'attachments', :action => 'show'
               # Allow downloading Web Service WSDL as a file with an extension
               # instead of a file named 'wsdl'
               map.connect ':controller/service.wsdl', :action => 'wsdl'

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages