DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

[fix #4473] Invite_administrateur!: do not reset password if the user is active

Browse source
This commit is contained in:
simon lehericey 2019-11-05 09:37:53 +01:00 • committed by Pierre de La Morinerie
parent 53c7997081
commit e3d7688e66
4 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/models/user.rb
View file

@ -47,11 +47,12 @@ class User < ApplicationRecord
end
def invite_administrateur!(administration_id)
if administrateur.active?
raise "Impossible d'inviter un utilisateur déjà actif !"
reset_password_token = nil
if !administrateur.active?
reset_password_token = set_reset_password_token
end
reset_password_token = set_reset_password_token
AdministrationMailer.invite_admin(self, reset_password_token, administration_id).deliver_later
end