jro_apps/redmine Commit - r7788:564321b2d5b8

move logic to use latest image file attachment to class method for common use (#3261)...

Toshi MARUYAMA -

r7788:564321b2d5b8

parent child

Context file:

r7788:564321b2d5b8

app/helpers/application_helper.rb +4 -4

               def parse_inline_attachments(text, project, obj, attr, only_path, options)
                 # when using an image link, try to use an attachment, if possible
                 if options[:attachments] || (obj && obj.respond_to?(:attachments))
-                  attachments = nil
+                  attachments = options[:attachments] || obj.attachments
                   text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpe|jpeg|png))"(\s+alt="([^"]*)")?/i) do |m|
                     filename, ext, alt, alttext = $1.downcase, $2, $3, $4
-                    attachments ||= (options[:attachments] || obj.attachments).sort_by(&:created_on).reverse
                     # search for the picture in attachments
-                    if found = attachments.detect { |att| att.filename.downcase == filename }
+                    if found = Attachment.latest_attach(attachments, filename)
-                      image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found
+                      image_url = url_for :only_path => only_path, :controller => 'attachments',
+                                          :action => 'download', :id => found
                       desc = found.description.to_s.gsub('"', '')
                       if !desc.blank? && alttext.blank?
                         alt = " title=\"#{desc}\" alt=\"#{desc}\""

app/models/attachment.rb +6 0

                 {:files => attached, :unsaved => obj.unsaved_attachments}
               end
+              def self.latest_attach(attachments, filename)
+                attachments.sort_by(&:created_on).reverse.detect {
+                  |att| att.filename.downcase == filename.downcase
+                 }
+              end
             private
               def sanitize_filename(value)
                 # get only the filename, not the whole path

test/unit/attachment_test.rb +20 0

@@ -121,4 +121,24 class AttachmentTest < ActiveSupport::TestCase
121	end	121	end
122	end	122	end
123	end	123	end
		124
		125	def test_latest_attach
		126	Attachment.storage_path = "#{Rails.root}/test/fixtures/files"
		127	a1 = Attachment.find(16)
		128	assert_equal "testfile.png", a1.filename
		129	assert a1.readable?
		130	assert (! a1.visible?(User.anonymous))
		131	assert a1.visible?(User.find(2))
		132	a2 = Attachment.find(17)
		133	assert_equal "testfile.PNG", a2.filename
		134	assert a2.readable?
		135	assert (! a2.visible?(User.anonymous))
		136	assert a2.visible?(User.find(2))
		137	assert a1.created_on < a2.created_on
		138
		139	la1 = Attachment.latest_attach([a1, a2], "testfile.png")
		140	assert_equal 17, la1.id
		141	la2 = Attachment.latest_attach([a1, a2], "Testfile.PNG")
		142	assert_equal 17, la2.id
		143	end
124	end	144	end

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