diff options
author | ThibG <thib@sitedethib.com> | 2019-04-10 22:33:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-10 22:33:41 +0200 |
commit | 31e4fcb006c6ef2d8e1a4c765e897afa1cba1b5c (patch) | |
tree | 15a022b1b44f72fee2d83cfe6f8355b7334f9d9b /app/controllers/auth/registrations_controller.rb | |
parent | cb410f80a40d03b509cec244b0cdd4ed3957c6a0 (diff) | |
parent | 2f422b708f75bea87a49eb879ec3e0c3f35c2f9b (diff) |
Merge pull request #985 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/auth/registrations_controller.rb')
-rw-r--r-- | app/controllers/auth/registrations_controller.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb index 74dd7ff34..84099bd96 100644 --- a/app/controllers/auth/registrations_controller.rb +++ b/app/controllers/auth/registrations_controller.rb @@ -11,6 +11,10 @@ class Auth::RegistrationsController < Devise::RegistrationsController before_action :set_instance_presenter, only: [:new, :create, :update] before_action :set_body_classes, only: [:new, :create, :edit, :update] + def new + super(&:build_invite_request) + end + def destroy not_found end @@ -25,17 +29,17 @@ class Auth::RegistrationsController < Devise::RegistrationsController def build_resource(hash = nil) super(hash) - resource.locale = I18n.locale - resource.invite_code = params[:invite_code] if resource.invite_code.blank? - resource.agreement = true + resource.locale = I18n.locale + resource.invite_code = params[:invite_code] if resource.invite_code.blank? + resource.agreement = true + resource.current_sign_in_ip = request.remote_ip - resource.current_sign_in_ip = request.remote_ip if resource.current_sign_in_ip.nil? resource.build_account if resource.account.nil? end def configure_sign_up_params devise_parameter_sanitizer.permit(:sign_up) do |u| - u.permit({ account_attributes: [:username] }, :email, :password, :password_confirmation, :invite_code) + u.permit({ account_attributes: [:username], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code) end end |