diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-04-10 00:36:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-10 00:36:01 +0200 |
| commit | 46cb36fd2cc641ab6c125f7e91140fa1b1d77634 (patch) | |
| tree | 3e659d684e3c8ee8b9c592b59310bfd0c2c43e18 /app/views | |
| parent | 36b39fbac55a9b141b99b54f193ec2702f8c3c39 (diff) | |
Add invite request to pending account notification e-mail (#10528)
Fix sorting of the pending accounts page
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin_mailer/new_pending_account.text.erb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/views/admin_mailer/new_pending_account.text.erb b/app/views/admin_mailer/new_pending_account.text.erb index ed31ae2eb..a466ee2de 100644 --- a/app/views/admin_mailer/new_pending_account.text.erb +++ b/app/views/admin_mailer/new_pending_account.text.erb @@ -2,7 +2,11 @@ <%= raw t('admin_mailer.new_pending_account.body') %> -<%= raw t('admin.accounts.email') %>: <%= @account.user_email %> -<%= raw t('admin.accounts.most_recent_ip') %>: <%= @account.user_current_sign_in_ip %> +<%= @account.user_email %> (@<%= @account.username %>) +<%= @account.user_current_sign_in_ip %> +<% if @account.user&.invite_request&.text.present? %> -<%= raw t('application_mailer.view')%> <%= admin_account_url(@account.id) %> +<%= quote_wrap(@account.user&.invite_request&.text) %> +<% end %> + +<%= raw t('application_mailer.view')%> <%= admin_pending_accounts_url %> |