From e75926314f967103abe97b253553c3e0b9a1aa32 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 10 Jul 2016 07:54:29 +0000
Subject: [PATCH] Merged r15587 and r15588 (#23180).

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15619 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/mailer/issue_add.html.erb  | 2 +-
 app/views/mailer/issue_edit.html.erb | 2 +-
 test/unit/mailer_test.rb             | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/mailer/issue_add.html.erb b/app/views/mailer/issue_add.html.erb
index 99fd08d14..14292be96 100644
--- 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 e3b6f5c6c..b68843fba 100644
--- 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 f875d3cbd..8f9763288 100644
--- 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',
-- 
2.39.5