Merge pull request #2795 from betagouv/unify

Unify
This commit is contained in:
gregoirenovel 2018-10-10 10:44:27 +02:00 committed by GitHub
commit 7b4ab556b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,12 +1,13 @@
class Users::Dossiers::InvitesController < UsersController
def authenticate_user!
session["user_return_to"] = request.fullpath
email = params[:email]
if params[:email].present? && User.find_by(email: params[:email]).nil?
return redirect_to new_user_registration_path(user: { email: params[:email] })
if email.present? && User.find_by(email: email).nil?
redirect_to new_user_registration_path(user: { email: email })
else
super
end
super
end
def show
@ -16,7 +17,7 @@ class Users::Dossiers::InvitesController < UsersController
if dossier.brouillon?
redirect_to brouillon_dossier_path(dossier)
else
return redirect_to dossier_path(dossier)
redirect_to dossier_path(dossier)
end
rescue ActiveRecord::RecordNotFound
flash.alert = t('errors.messages.dossier_not_found')