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.html.haml
+++ b/app/views/user_mailer/confirmation_instructions.html.haml
@ -36,7 +36,7 @@
                        %tbody
                          %tr
                            %td.column-cell.text-center
-                              %p= t 'devise.mailer.confirmation_instructions.explanation', host: site_hostname
+                              %p= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname

 %table.email-table{ cellspacing: 0, cellpadding: 0 }
  %tbody