rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-09 03:16:25 +00:00
Code Issues Releases Wiki Activity

Automatically consider email valid when user is set to STATE_ACTIVE

Browse source
This commit is contained in:
Jean-Romain Garnier 2020-04-17 12:50:22 +02:00 committed by Jean-Romain Garnier
parent 32a7c80133
commit bd153d53b2
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
users/models.py
View file

@ -654,16 +654,15 @@ class User(
and self.state == self.STATE_FULL_ARCHIVE and self.state == self.STATE_FULL_ARCHIVE
): ):
self.full_archive() self.full_archive()
elif (
self.__original_state == self.STATE_EMAIL_NOT_YET_CONFIRMED
and self.state not in [self.STATE_EMAIL_NOT_YET_CONFIRMED, self.STATE_DISABLED]
):
self.email_change_date = None
elif ( elif (
self.__original_state != self.STATE_EMAIL_NOT_YET_CONFIRMED self.__original_state != self.STATE_EMAIL_NOT_YET_CONFIRMED
and self.state == self.STATE_EMAIL_NOT_YET_CONFIRMED and self.state == self.STATE_EMAIL_NOT_YET_CONFIRMED
): ):
self.email_change_date = timezone.now() self.email_change_date = timezone.now()
elif (
self.state == self.STATE_ACTIVE
):
self.email_change_date = None
def ldap_sync( def ldap_sync(
self, base=True, access_refresh=True, mac_refresh=True, group_refresh=False self, base=True, access_refresh=True, mac_refresh=True, group_refresh=False