mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-05 01:16:27 +00:00
Fix overlapping conditions in User.state_sync
This commit is contained in:
parent
b7021f32cb
commit
e0de606221
1 changed files with 1 additions and 4 deletions
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue