jro_apps/redmine Commit - r1669:9b579de9e234

app/controllers/attachments_controller.rb +3 0

             private
               def find_project
                 @attachment = Attachment.find(params[:id])
+                # Show 404 if the filename in the url is wrong
+                raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename
                 @project = @attachment.project
                 permission = @attachment.container.is_a?(Version) ? :view_files : "view_#{@attachment.container.class.name.underscore.pluralize}".to_sym
                 allowed = User.current.allowed_to?(permission, @project)

app/helpers/application_helper.rb +11 0

@@ -47,6 +47,17 module ApplicationHelper
47	link_to "#{issue.tracker.name} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, options	47	link_to "#{issue.tracker.name} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, options
48	end	48	end
49		49
		50	# Generates a link to an attachment.
		51	# Options:
		52	# * :text - Link text (default to attachment filename)
		53	# * :download - Force download (default: false)
		54	def link_to_attachment(attachment, options={})
		55	text = options.delete(:text) \|\| attachment.filename
		56	action = options.delete(:download) ? 'download' : 'show'
		57
		58	link_to(h(text), {:controller => 'attachments', :action => action, :id => attachment, :filename => attachment.filename }, options)
		59	end
		60
50	def toggle_link(name, id, options={})	61	def toggle_link(name, id, options={})
51	onclick = "Element.toggle('#{id}'); "	62	onclick = "Element.toggle('#{id}'); "
52	onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")	63	onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")

app/helpers/issues_helper.rb +2 -2

                   label = content_tag('strong', label)
                   old_value = content_tag("i", h(old_value)) if detail.old_value
                   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? && a = Attachment.find_by_id(detail.prop_key)
                     # Link to the attachment if it has not been removed
-                    value = link_to(value, :controller => 'attachments', :action => 'show', :id => detail.prop_key)
+                    value = link_to_attachment(a)
                   else
                     value = content_tag("i", h(value)) if value
                   end

app/models/attachment.rb +1 -1

               validates_length_of :disk_filename, :maximum => 255
               acts_as_event :title => :filename,
-                            :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id}}
+                            :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id, :filename => o.filename}}
               cattr_accessor :storage_path
               @@storage_path = "#{RAILS_ROOT}/files"

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

             <div class="attachments">
             <% for attachment in attachments %>
-            <p><%= link_to attachment.filename, {:controller => 'attachments', :action => 'show', :id => attachment }, :class => 'icon icon-attachment' -%>
+            <p><%= link_to_attachment 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] %>

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

             <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 } -%>
+            <p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
                <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
             </div>

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

             <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 } -%>
+            <p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
                <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
             </div>

app/views/projects/list_files.rhtml +1 -2

               <% for file in version.attachments %>
               <tr class="<%= cycle("odd", "even") %>">
                 <td></td>
-                <td><%= link_to(h(file.filename), {:controller => 'attachments', :action => 'download', :id => file},
+                <td><%= link_to_attachment file, :download => true, :title => file.description %></td>
-                                                  :title => file.description) %></td>
                 <td align="center"><%= format_time(file.created_on) %></td>
                 <td align="center"><%= number_to_human_size(file.filesize) %></td>
                 <td align="center"><%= file.downloads %></td>

config/routes.rb +4 -2

                 omap.repositories_revision 'repositories/revision/:id/:rev', :action => 'revision'
               end
-              map.connect 'attachments/:id', :controller => 'attachments', :action => 'show'
+              map.connect 'attachments/:id', :controller => 'attachments', :action => 'show', :id => /\d+/
+              map.connect 'attachments/:id/:filename', :controller => 'attachments', :action => 'show', :id => /\d+/, :filename => /.*/
+              map.connect 'attachments/download/:id/:filename', :controller => 'attachments', :action => 'download', :id => /\d+/, :filename => /.*/
               # Allow downloading Web Service WSDL as a file with an extension
               # instead of a file named 'wsdl'
               map.connect ':controller/service.wsdl', :action => 'wsdl'

test/functional/attachments_controller_test.rb +15 0

@@ -33,6 +33,21 class AttachmentsControllerTest < Test::Unit::TestCase
33	User.current = nil	33	User.current = nil
34	end	34	end
35		35
		36	def test_routing
		37	assert_routing('/attachments/1', :controller => 'attachments', :action => 'show', :id => '1')
		38	assert_routing('/attachments/1/filename.ext', :controller => 'attachments', :action => 'show', :id => '1', :filename => 'filename.ext')
		39	assert_routing('/attachments/download/1', :controller => 'attachments', :action => 'download', :id => '1')
		40	assert_routing('/attachments/download/1/filename.ext', :controller => 'attachments', :action => 'download', :id => '1', :filename => 'filename.ext')
		41	end
		42
		43	def test_recognizes
		44	assert_recognizes({:controller => 'attachments', :action => 'show', :id => '1'}, '/attachments/1')
		45	assert_recognizes({:controller => 'attachments', :action => 'show', :id => '1'}, '/attachments/show/1')
		46	assert_recognizes({:controller => 'attachments', :action => 'show', :id => '1', :filename => 'filename.ext'}, '/attachments/1/filename.ext')
		47	assert_recognizes({:controller => 'attachments', :action => 'download', :id => '1'}, '/attachments/download/1')
		48	assert_recognizes({:controller => 'attachments', :action => 'download', :id => '1', :filename => 'filename.ext'},'/attachments/download/1/filename.ext')
		49	end
		50
36	def test_show_diff	51	def test_show_diff
37	get :show, :id => 5	52	get :show, :id => 5
38	assert_response :success	53	assert_response :success

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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