IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: resending invite should include original custom message

Browse Source 
https://meta.discourse.org/t/will-resent-invite-include-original-custom-message/64699
This commit is contained in:
Arpit Jalan
2017-06-30 16:09:37 +05:30
parent c1580b9d36
commit 16d356ab4e
5 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/mailers/invite_mailer.rb
View File

@@ -8,7 +8,7 @@ class InviteMailer < ActionMailer::Base
include EmailHelper
end
def send_invite(invite, custom_message=nil)
def send_invite(invite)
# Find the first topic they were invited to
first_topic = invite.topics.order(:created_at).first
@@ -27,7 +27,7 @@ class InviteMailer < ActionMailer::Base
end
template = 'invite_mailer'
if custom_message.present?
if invite.custom_message.present?
template = 'custom_invite_mailer'
end
@@ -46,10 +46,10 @@ class InviteMailer < ActionMailer::Base
topic_excerpt: topic_excerpt,
site_description: SiteSetting.site_description,
site_title: SiteSetting.title,
user_custom_message: custom_message)
user_custom_message: invite.custom_message)
else
template = 'invite_forum_mailer'
if custom_message.present?
if invite.custom_message.present?
template = 'custom_invite_forum_mailer'
end
@@ -60,7 +60,7 @@ class InviteMailer < ActionMailer::Base
invite_link: "#{Discourse.base_url}/invites/#{invite.invite_key}",
site_description: SiteSetting.site_description,
site_title: SiteSetting.title,
user_custom_message: custom_message)
user_custom_message: invite.custom_message)
end
end