Admission-based registrations mode (#10250)

Fix #6856 Fix #6951
2019-03-14 05:28:30 +01:00
parent 6e3936aa6f
commit 51e154f5e8
92 changed files with 282 additions and 249 deletions
--- a/app/views/user_mailer/confirmation_instructions.text.erb
+++ b/app/views/user_mailer/confirmation_instructions.text.erb
@ -2,7 +2,7 @@

 ===

-<%= t 'devise.mailer.confirmation_instructions.explanation', host: site_hostname %>
+<%= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname %>

 => <%= confirmation_url(@resource, confirmation_token: @token, redirect_to_app: @resource.created_by_application ? 'true' : nil) %>