jro_apps/redmine Commit - r2669:c082cfc90ef8

FIxed: inline images not displayed in atom feeds (#3391)....

Jean-Philippe Lang -

r2669:c082cfc90ef8

parent child

Context file:

r2669:c082cfc90ef8

app/views/common/feed.atom.rxml +1 -1

                     xml.email(author.mail) if author.is_a?(User) && !author.mail.blank? && !author.pref.hide_mail
                   end if author
                   xml.content "type" => "html" do
-                    xml.text! textilizable(item.event_description, :only_path => false)
+                    xml.text! textilizable(item, :event_description, :only_path => false)
                   end
                 end
               end

app/views/issues/changes.rxml +1 -1

                       xml.text! '<li>' + show_detail(detail, false) + '</li>'
                     end
                     xml.text! '</ul>'
-                    xml.text! textilizable(change.notes) unless change.notes.blank?
+                    xml.text! textilizable(change, :notes, :only_path => false) unless change.notes.blank?
                   end
                 end
               end

test/fixtures/attachments.yml +12 0

@@ -109,4 +109,16 attachments_009:
109	filename: version_file.zip	109	filename: version_file.zip
110	author_id: 2	110	author_id: 2
111	content_type: application/octet-stream	111	content_type: application/octet-stream
		112	attachments_010:
		113	created_on: 2006-07-19 21:07:27 +02:00
		114	container_type: Issue
		115	container_id: 2
		116	downloads: 0
		117	disk_filename: 060719210727_picture.jpg
		118	digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
		119	id: 10
		120	filesize: 452
		121	filename: picture.jpg
		122	author_id: 2
		123	content_type: image/jpeg
112	No newline at end of file	124

test/fixtures/journals.yml +7 0

@@ -13,4 +13,11 journals_002:
13	journalized_type: Issue	13	journalized_type: Issue
14	user_id: 2	14	user_id: 2
15	journalized_id: 1	15	journalized_id: 1
		16	journals_003:
		17	created_on: <%= 1.days.ago.to_date.to_s(:db) %>
		18	notes: "A comment with inline image: !picture.jpg!"
		19	id: 3
		20	journalized_type: Issue
		21	user_id: 2
		22	journalized_id: 2
16	No newline at end of file	23

test/functional/issues_controller_test.rb +8 0

                                     :descendant => { :tag => 'a', :content => /#4$/ }
               end
+              def test_show_atom
+                get :show, :id => 2, :format => 'atom'
+                assert_response :success
+                assert_template 'changes.rxml'
+                # Inline image
+                assert @response.body.include?("&lt;img src=\"http://test.host/attachments/download/10\" alt=\"\" /&gt;")
+              end
               def test_new_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/1/issues/new'},

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