Commit 4cd2f1d9 authored by sjain1107's avatar sjain1107 Committed by Dennis Schubert

Add inviter diaspora-ID to the invite email #6796

closes #6817
parent ce6b1a3c
......@@ -8,6 +8,8 @@
## Features
* The sender's diaspora-ID is now shown in invitation mails [#6817](https://github.com/diaspora/diaspora/pull/6817)
# 0.5.8.0
## Refactor
......
......@@ -39,7 +39,7 @@ class InvitationsController < ApplicationController
else
params[:invitation_code]
end
@inviter = user || InvitationCode.where(id: params[:invitation_code]).first.try(:user)
if @invitation_code.present?
render 'notifier/invite', :layout => false
else
......
<%= t('.message', :invite_url => invite_code_url(@invitation_code), :diasporafoundation_url => 'https://diasporafoundation.org/') %>
<%= t('.message', :invite_url => invite_code_url(@invitation_code), :diasporafoundation_url => 'https://diasporafoundation.org/', :diaspora_id => @inviter.try(:diaspora_handle)) %>
......@@ -838,12 +838,14 @@ en:
message: |-
Hello!
You have been invited to join diaspora*!
You have been invited to join diaspora* by %{diaspora_id}!
Click this link to get started
[%{invite_url}][1]
Or you can add %{diaspora_id} to your contacts if you already have an account.
Love,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment