diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-10-30 19:35:59 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-10-30 19:35:59 +0100 |
| commit | 5fd758fad18830e9e4b7baeccd87977397cf824a (patch) | |
| tree | 059d44dd865528c2721eef9cf7ef990d23f2f1a3 | |
| parent | 8048874a3a62abab052d769b7fcae1c2c947e398 (diff) | |
| parent | a529d6d93e777003019f1ab0d7ff913134625cf6 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
| -rw-r--r-- | app/controllers/auth/registrations_controller.rb | 1 | ||||
| -rw-r--r-- | app/views/auth/registrations/rules.html.haml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb index f31677f64..edef0d5bb 100644 --- a/app/controllers/auth/registrations_controller.rb +++ b/app/controllers/auth/registrations_controller.rb @@ -153,6 +153,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController return if @rules.empty? || (session[:accept_token].present? && params[:accept] == session[:accept_token]) @accept_token = session[:accept_token] = SecureRandom.hex + @invite_code = invite_code set_locale { render :rules } end diff --git a/app/views/auth/registrations/rules.html.haml b/app/views/auth/registrations/rules.html.haml index a41581b32..8e7a90cbe 100644 --- a/app/views/auth/registrations/rules.html.haml +++ b/app/views/auth/registrations/rules.html.haml @@ -14,7 +14,8 @@ .rules-list__text= rule.text .stacked-actions - = link_to t('auth.rules.accept'), new_user_registration_path(accept: @accept_token), class: 'button' + - accept_path = @invite_code.present? ? public_invite_url(invite_code: @invite_code, accept: @accept_token) : new_user_registration_path(accept: @accept_token) + = link_to t('auth.rules.accept'), accept_path, class: 'button' = link_to t('auth.rules.back'), root_path, class: 'button button-tertiary' .form-footer= render 'auth/shared/links' |