From 51e154f5e87968d6bb115e053689767ab33e80cd Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 14 Mar 2019 05:28:30 +0100 Subject: Admission-based registrations mode (#10250) Fix #6856 Fix #6951 --- app/mailers/admin_mailer.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'app/mailers') diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb index a30468eb8..ecbbe745b 100644 --- a/app/mailers/admin_mailer.rb +++ b/app/mailers/admin_mailer.rb @@ -14,4 +14,14 @@ class AdminMailer < ApplicationMailer mail to: @me.user_email, subject: I18n.t('admin_mailer.new_report.subject', instance: @instance, id: @report.id) end end + + def new_pending_account(recipient, account) + @account = account + @me = recipient + @instance = Rails.configuration.x.local_domain + + locale_for_account(@me) do + mail to: @me.user_email, subject: I18n.t('admin_mailer.new_pending_account.subject', instance: @instance, username: @account.username) + end + end end -- cgit From 874bd3ac0c56e2d2901785e170b27f5cde32b33b Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 14 Mar 2019 14:20:22 +0100 Subject: Fix error in AdminMailer#new_pending_account (#10264) --- app/mailers/admin_mailer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/mailers') diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb index ecbbe745b..db154cad5 100644 --- a/app/mailers/admin_mailer.rb +++ b/app/mailers/admin_mailer.rb @@ -15,8 +15,8 @@ class AdminMailer < ApplicationMailer end end - def new_pending_account(recipient, account) - @account = account + def new_pending_account(recipient, user) + @account = user.account @me = recipient @instance = Rails.configuration.x.local_domain -- cgit