jro_apps/redmine Commit - r1147:e5daf25618e0

Fixes:...

Jean-Philippe Lang -

r1147:e5daf25618e0

parent child

Context file:

r1147:e5daf25618e0

Collapse all files

app/helpers/application_helper.rb +24 -13

                 case args.size
                 when 1
                   obj = nil
-                  text = args.shift || ''
+                  text = args.shift
                 when 2
                   obj = args.shift
-                  text = obj.send(args.shift)
+                  text = obj.send(args.shift).to_s
                 else
                   raise ArgumentError, 'invalid arguments to textilizable'
                 end
+                return '' if text.blank?
+                only_path = options.delete(:only_path) == false ? false : true
                 # when using an image link, try to use an attachment, if possible
-                attachments = options[:attachments]
+                attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
                 if attachments
                   text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
                     style = $1
                     rf = Regexp.new(filename,  Regexp::IGNORECASE)
                     # search for the picture in attachments
                     if found = attachments.detect { |att| att.filename =~ rf }
-                      image_url = url_for :controller => 'attachments', :action => 'download', :id => found.id
+                      image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found.id
                       "!#{style}#{image_url}!"
                     else
                       "!#{style}#{filename}!"
                   # used for single-file wiki export
                   format_wiki_link = Proc.new {|project, title| "##{title}" }
                 else
-                  format_wiki_link = Proc.new {|project, title| url_for :controller => 'wiki', :action => 'index', :id => project, :page => title }
+                  format_wiki_link = Proc.new {|project, title| url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => project, :page => title) }
                 end
-                project = options[:project] || @project
+                project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
                 # Wiki links
                 #
                   if esc.nil?
                     if prefix.nil? && sep == 'r'
                       if project && (changeset = project.changesets.find_by_revision(oid))
-                        link = link_to("r#{oid}", {:controller => 'repositories', :action => 'revision', :id => project.id, :rev => oid}, :class => 'changeset',
+                        link = link_to("r#{oid}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project.id, :rev => oid},
+                                                  :class => 'changeset',
                                                   :title => truncate(changeset.comments, 100))
                       end
                     elsif sep == '#'
                       case prefix
                       when nil
                         if issue = Issue.find_by_id(oid, :include => [:project, :status], :conditions => Project.visible_by(User.current))
-                          link = link_to("##{oid}", {:controller => 'issues', :action => 'show', :id => oid}, :class => 'issue',
+                          link = link_to("##{oid}", {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid},
+                                                    :class => 'issue',
                                                     :title => "#{truncate(issue.subject, 100)} (#{issue.status.name})")
                           link = content_tag('del', link) if issue.closed?
                         end
                       when 'document'
                         if document = Document.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
-                          link = link_to h(document.title), {:controller => 'documents', :action => 'show', :id => document}, :class => 'document'
+                          link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
+                                                            :class => 'document'
                         end
                       when 'version'
                         if version = Version.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
-                          link = link_to h(version.name), {:controller => 'versions', :action => 'show', :id => version}, :class => 'version'
+                          link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
+                                                          :class => 'version'
                         end
                       end
                     elsif sep == ':'
                       case prefix
                       when 'document'
                         if project && document = project.documents.find_by_title(name)
-                          link = link_to h(document.title), {:controller => 'documents', :action => 'show', :id => document}, :class => 'document'
+                          link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
+                                                            :class => 'document'
                         end
                       when 'version'
                         if project && version = project.versions.find_by_name(name)
-                          link = link_to h(version.name), {:controller => 'versions', :action => 'show', :id => version}, :class => 'version'
+                          link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
+                                                          :class => 'version'
                         end
                       when 'attachment'
                         if attachments && attachment = attachments.detect {|a| a.filename == name }
-                          link = link_to h(attachment.filename), {:controller => 'attachments', :action => 'download', :id => attachment}, :class => 'attachment'
+                          link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment},
+                                                                 :class => 'attachment'
                         end
                       end
                     end

app/models/journal.rb +8 -1

@@ -51,7 +51,14 class Journal < ActiveRecord::Base
51	end	51	end
52		52
53	def editable_by?(usr)	53	def editable_by?(usr)
54	project = journalized.project
55	usr && usr.logged? && (usr.allowed_to?(:edit_issue_notes, project) \|\| (self.user == usr && usr.allowed_to?(:edit_own_issue_notes, project)))	54	usr && usr.logged? && (usr.allowed_to?(:edit_issue_notes, project) \|\| (self.user == usr && usr.allowed_to?(:edit_own_issue_notes, project)))
56	end	55	end
		56
		57	def project
		58	journalized.respond_to?(:project) ? journalized.project : nil
		59	end
		60
		61	def attachments
		62	journalized.respond_to?(:attachments) ? journalized.attachments : nil
		63	end
57	end	64	end

app/views/mailer/_issue_text_html.rhtml +1 -1

             <% end %>
             </ul>
-            <%= textilizable(issue.description) %>
+            <%= textilizable(issue, :description, :only_path => false) %>

app/views/mailer/document_added.text.html.rhtml +1 -1

             <%= link_to @document.title, @document_url %> (<%= @document.category.name %>)<br />
             <br />
-            <%= textilizable(@document.description) %>
+            <%= textilizable(@document, :description, :only_path => false) %>

app/views/mailer/issue_edit.text.html.rhtml +1 -1

             <% end %>
             </ul>
-            <%= textilizable(@journal.notes) %>
+            <%= textilizable(@journal, :notes, :only_path => false) %>
             <hr />
             <%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>

app/views/mailer/message_posted.text.html.rhtml +1 -1

             <h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to @message.subject, @message_url %></h1>
             <em><%= @message.author %></em>
-            <%= textilizable @message.content %>
+            <%= textilizable(@message, :content, :only_path => false) %>

app/views/mailer/news_added.text.html.rhtml +1 -1

             <h1><%= link_to @news.title, @news_url %></h1>
             <em><%= @news.author.name %></em>
-            <%= textilizable(@news.description) %>
+            <%= textilizable(@news, :description, :only_path => false) %>

test/fixtures/journals.yml +1 -1

               journalized_id: 1
             journals_002:
               created_on: <%= 1.days.ago.to_date.to_s(:db) %>
-              notes: "Some notes"
+              notes: "Some notes with Redmine links: #2, r2."
               id: 2
               journalized_type: Issue
               user_id: 2

test/unit/mailer_test.rb +20 -1

@@ -18,7 +18,26
18	require File.dirname(__FILE__) + '/../test_helper'	18	require File.dirname(__FILE__) + '/../test_helper'
19		19
20	class MailerTest < Test::Unit::TestCase	20	class MailerTest < Test::Unit::TestCase
21	fixtures :projects, :issues, :users, :members, :documents, :attachments, :news, :tokens, :journals, :journal_details, :trackers, :issue_statuses, :enumerations	21	fixtures :projects, :issues, :users, :members, :documents, :attachments, :news, :tokens, :journals, :journal_details, :changesets, :trackers, :issue_statuses, :enumerations
		22
		23	def test_generated_links_in_emails
		24	ActionMailer::Base.deliveries.clear
		25	Setting.host_name = 'mydomain.foo'
		26	Setting.protocol = 'https'
		27
		28	journal = Journal.find(2)
		29	assert Mailer.deliver_issue_edit(journal)
		30
		31	mail = ActionMailer::Base.deliveries.last
		32	assert_kind_of TMail::Mail, mail
		33	# link to the main ticket
		34	assert mail.body.include?('<a href="https://mydomain.foo/issues/show/1">Bug #1: Can\'t print recipes</a>')
		35
		36	# link to a referenced ticket
		37	assert mail.body.include?('<a href="https://mydomain.foo/issues/show/2" class="issue" title="Add ingredients categories (Assigned)">#2</a>')
		38	# link to a changeset
		39	assert mail.body.include?('<a href="https://mydomain.foo/repositories/revision/1?rev=2" class="changeset" title="This commit fixes #1, #2 and references #1 & #3">r2</a>')
		40	end
22		41
23	# test mailer methods for each language	42	# test mailer methods for each language
24	def test_issue_add	43	def test_issue_add

General Comments 0

Write
Preview

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

No TODOs yet

	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