rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-08-10 17:25:02 +00:00
Code Issues Releases Wiki Activity

Fix overlapping conditions in User.state_sync

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

5
users/models.py
View file

@ -643,6 +643,7 @@ class User(
self.__original_state != self.STATE_ACTIVE self.__original_state != self.STATE_ACTIVE
and self.state == self.STATE_ACTIVE and self.state == self.STATE_ACTIVE
): ):
self.email_change_date = None
self.unarchive() self.unarchive()
elif ( elif (
self.__original_state != self.STATE_ARCHIVE self.__original_state != self.STATE_ARCHIVE
@ -659,10 +660,6 @@ class User(
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