Merged r15587 and r15588 (#23180).

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15619 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/mailer/issue_add.html.erb b/app/views/mailer/issue_add.html.erb
index 99fd08d14050d16767fec435763616e5b306dcfd..14292be96525e3a96dbe59ed880897a9f733157f 100644 (file)
--- a/app/views/mailer/issue_add.html.erb
+++ b/app/views/mailer/issue_add.html.erb
@@ -1,3 +1,3 @@
-<%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %>
+<%= l(:text_issue_added, :id => link_to("##{@issue.id}", @issue_url), :author => h(@issue.author)).html_safe %>
 <hr />
 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>

diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb
index e3b6f5c6c22eda234739720b458ccf7cae172037..b68843fba2189f0c420cd2eb60e549cf85f0f59c 100644 (file)
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@@ -1,7 +1,7 @@
 <% if @journal.private_notes? %>
   (<%= l(:field_private_notes) %>)
 <% end %>
-<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %>
+<%= l(:text_issue_updated, :id => link_to("##{@issue.id}", @issue_url), :author => h(@journal.user)).html_safe %>
 
 <ul>
 <% details_to_strings(@journal_details, false, :only_path => false).each do |string| %>

diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index f875d3cbdd756c5b2f84b1537de4e1fb884a1792..8f9763288f1d787623c5b11acf3b3520151270c1 100644 (file)
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -45,6 +45,10 @@ class MailerTest < ActiveSupport::TestCase
     assert_not_nil mail
 
     assert_select_email do
+      # link to the main ticket on issue id
+      assert_select 'a[href=?]',
+                    'https://mydomain.foo/issues/2#change-3',
+                    :text => '#2'
       # link to the main ticket
       assert_select 'a[href=?]',
                     'https://mydomain.foo/issues/2#change-3',