rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-27 07:02:26 +00:00
Code Issues Releases Wiki Activity

Make email check more pythonic

Browse source
This commit is contained in:
Jean-Romain Garnier 2020-04-21 18:19:03 +02:00 committed by Gabriel Detraz
parent 259e9eff51
commit 4a7c5c1bdb
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
users/forms.py
View file

@ -150,7 +150,7 @@ class UserCreationForm(FormRevMixin, forms.ModelForm):
def clean_email(self): def clean_email(self):
new_email = self.cleaned_data.get("email") new_email = self.cleaned_data.get("email")
if not new_email or len(new_email) == 0: if not new_email:
raise forms.ValidationError( raise forms.ValidationError(
_("Email field cannot be empty.") _("Email field cannot be empty.")
) )
@ -492,7 +492,7 @@ class AdherentCreationForm(AdherentForm):
"""Forbid empty email""" """Forbid empty email"""
new_email = self.cleaned_data.get("email") new_email = self.cleaned_data.get("email")
if not new_email or len(new_email) == 0: if not new_email:
raise forms.ValidationError( raise forms.ValidationError(
_("Email field cannot be empty.") _("Email field cannot be empty.")
) )
@ -539,7 +539,7 @@ class AdherentEditForm(AdherentForm):
"Leave empty if you don't have any GPG key." "Leave empty if you don't have any GPG key."
) )
self.user = kwargs["instance"] self.user = kwargs["instance"]
self.fields["email"].required = self.user.email and len(self.user.email) self.fields["email"].required = bool(self.user.email)
if "shell" in self.fields: if "shell" in self.fields:
self.fields["shell"].empty_label = _("Default shell") self.fields["shell"].empty_label = _("Default shell")
@ -565,10 +565,10 @@ class AdherentEditForm(AdherentForm):
new_email = self.cleaned_data.get("email") new_email = self.cleaned_data.get("email")
# Allow empty emails if the user had an empty email before # Allow empty emails if the user had an empty email before
if original_email is None or len(original_email) == 0: if not original_email:
return new_email return new_email
if new_email is None or len(new_email) == 0: if not new_email:
raise forms.ValidationError( raise forms.ValidationError(
_("Email field cannot be empty.") _("Email field cannot be empty.")
) )
@ -870,7 +870,7 @@ class EmailSettingsForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
super(EmailSettingsForm, self).__init__(*args, prefix=prefix, **kwargs) super(EmailSettingsForm, self).__init__(*args, prefix=prefix, **kwargs)
self.user = kwargs["instance"] self.user = kwargs["instance"]
self.fields["email"].label = _("Main email address") self.fields["email"].label = _("Main email address")
self.fields["email"].required = self.user.email and len(self.user.email) self.fields["email"].required = bool(self.user.email)
if "local_email_redirect" in self.fields: if "local_email_redirect" in self.fields:
self.fields["local_email_redirect"].label = _("Redirect local emails") self.fields["local_email_redirect"].label = _("Redirect local emails")
if "local_email_enabled" in self.fields: if "local_email_enabled" in self.fields:
@ -881,10 +881,10 @@ class EmailSettingsForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
new_email = self.cleaned_data.get("email") new_email = self.cleaned_data.get("email")
# Allow empty emails if the user had an empty email before # Allow empty emails if the user had an empty email before
if original_email is None or len(original_email) == 0: if not original_email:
return new_email return new_email
if new_email is None or len(new_email) == 0: if not new_email:
raise forms.ValidationError( raise forms.ValidationError(
_("Email field cannot be empty.") _("Email field cannot be empty.")
) )