From 604bfb09234c3d01c6177c81cc96641cc61ba2bc Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 27 Aug 2018 22:04:37 -0500 Subject: [PATCH] Fix #3846: Subscribed forum posts link to invalid URL in email updates. Test: http://localhost/rails/mailers/user_mailer/forum_notice --- app/views/user_mailer/forum_notice.html.erb | 2 +- test/mailers/previews/user_mailer_preview.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/views/user_mailer/forum_notice.html.erb b/app/views/user_mailer/forum_notice.html.erb index 985cb0d8d..f5223a6dd 100644 --- a/app/views/user_mailer/forum_notice.html.erb +++ b/app/views/user_mailer/forum_notice.html.erb @@ -4,7 +4,7 @@

<%= forum_post.creator_name %> said:

- <%= format_text(forum_post.body) %> + <%= format_text(forum_post.body, base_url: root_url) %>


diff --git a/test/mailers/previews/user_mailer_preview.rb b/test/mailers/previews/user_mailer_preview.rb index ec87e1e02..326b665a5 100644 --- a/test/mailers/previews/user_mailer_preview.rb +++ b/test/mailers/previews/user_mailer_preview.rb @@ -3,4 +3,12 @@ class UserMailerPreview < ActionMailer::Preview dmail = User.admins.first.dmails.first UserMailer.dmail_notice(dmail) end + + def forum_notice + topic = ForumTopic.first + posts = topic.posts + user = topic.creator + + UserMailer.forum_notice(user, topic, posts) + end end