From 351495e7ff74d3661207196a150e0b3c1d5242c7 Mon Sep 17 00:00:00 2001 From: grisel-davy Date: Thu, 9 Aug 2018 23:43:35 +0200 Subject: [PATCH] verification des extension mail externe et lower des adresses mail pour mieux verifier les doublons --- users/forms.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/users/forms.py b/users/forms.py index dac86d71..6c2afd1f 100644 --- a/users/forms.py +++ b/users/forms.py @@ -620,6 +620,9 @@ class EMailAddressForm(FormRevMixin, ModelForm): super(EMailAddressForm, self).__init__(*args, prefix=prefix, **kwargs) self.fields['local_part'].label = "Local part of the email" self.fields['local_part'].help_text = "Can't contain @" + + def clean_local_part(self): + return self.cleaned_data.get('local_part').lower() def clean_local_part(self): return self.cleaned_data.get('local_part').lower() @@ -646,6 +649,12 @@ class EmailSettingsForm(FormRevMixin, FieldPermissionFormMixin, ModelForm): else: raise forms.ValidationError("Vous ne pouvez pas utiliser une addresse {}".format(OptionalUser.objects.first().local_email_domain)) + def clean_email(self): + if not OptionalUser.objects.first().local_email_domain in self.cleaned_data.get('email'): + return self.cleaned_data.get('email').lower() + else: + raise forms.ValidationError("Vous ne pouvez pas utiliser une addresse {}".format(OptionalUser.objects.first().local_email_domain)) + class Meta: model = User fields = ['email','local_email_enabled', 'local_email_redirect']