From e0609d27dd1a0a5f846d65b2bf9ce50b9993c056 Mon Sep 17 00:00:00 2001 From: Jean-Romain Garnier Date: Fri, 17 Apr 2020 12:53:51 +0000 Subject: [PATCH] Fix wrong email showing up when editing user --- users/forms.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/users/forms.py b/users/forms.py index dd9ddaa7..24657fc2 100644 --- a/users/forms.py +++ b/users/forms.py @@ -330,11 +330,7 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm): self.fields["room"].label = _("Room") self.fields["room"].empty_label = _("No room") self.fields["school"].empty_label = _("Select a school") - - if not kwargs["user"].is_anonymous(): - self.initial["email"] = kwargs["user"].email - else: - self.initial["email"] = None + self.is_anon = kwargs["user"].is_anonymous() class Meta: model = Adherent @@ -387,7 +383,7 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm): """On met à jour l'état de l'utilisateur en fonction de son mail""" user = super(AdherentForm, self).save(commit=commit) - if self.initial["email"] is not None and user.email != self.initial["email"]: + if not self.is_anon and self.initial["email"] and user.email != self.initial["email"]: # Send a confirmation email if user.state in [User.STATE_ACTIVE, User.STATE_DISABLED, User.STATE_NOT_YET_ACTIVE, User.STATE_EMAIL_NOT_YET_CONFIRMED]: user.state = User.STATE_EMAIL_NOT_YET_CONFIRMED