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

Merge pull request #4213 from betagouv/fix_manager_reset_password

Browse source 
Corriger un bug dans le manager concernant le reset de password
This commit is contained in:
LeSim 2019-08-20 12:17:37 +02:00 committed by GitHub
commit 132900cca2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/administrateur.rb
View file

@ -47,7 +47,7 @@ class Administrateur < ApplicationRecord
def registration_state def registration_state
if active? if active?
'Actif' 'Actif'
elsif reset_password_period_valid? elsif user.reset_password_period_valid?
'En attente' 'En attente'
else else
'Expiré' 'Expiré'
@ -55,7 +55,7 @@ class Administrateur < ApplicationRecord
end end
def invitation_expired? def invitation_expired?
!active && !reset_password_period_valid? !active && !user.reset_password_period_valid?
end end
def self.reset_password(reset_password_token, password) def self.reset_password(reset_password_token, password)