Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5666 from LeoMcA/pm-subject-fix 

FIX: error when group_in_subject enabled but no group in pm
This commit is contained in:
Guo Xiang Tan 2018-03-12 09:34:37 +08:00 committed by GitHub
parent 3a35f459c7 89f41f8236
commit ed08bc82f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/mailers/user_notifications.rb
View File

@ -435,13 +435,11 @@ class UserNotifications < ActionMailer::Base
if post.topic.private_message? if post.topic.private_message?
subject_pm = subject_pm =
if opts[:show_group_in_subject] if opts[:show_group_in_subject] and group = post.topic.allowed_groups&.first
if group = post.topic.allowed_groups&.first if group.full_name
if group.full_name "[#{group.full_name}] "
"[#{group.full_name}] " else
else "[#{group.name}] "
"[#{group.name}] "
end
end end
else else
I18n.t('subject_pm') I18n.t('subject_pm')

6
spec/mailers/user_notifications_spec.rb
View File

@ -467,6 +467,12 @@ describe UserNotifications do
include_examples "includes first group name" include_examples "includes first group name"
end end
context "no groups in pm" do
it "includes %{optional_pm} in subject" do
expect(mail.subject).to include("[PM] ")
end
end
end end
end end