rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-22 11:23:10 +00:00
Code Issues Releases Wiki Activity

Fix error preventing migration

Browse source
This commit is contained in:
Jean-Romain Garnier 2020-04-17 18:01:35 +02:00 committed by Jean-Romain Garnier
parent 1484b6ec1e
commit 3c5e538218
1 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
users/forms.py
View file

@ -405,41 +405,40 @@ class AdherentCreationForm(AdherentForm):
AdherentForm auquel on ajoute une checkbox afin d'éviter les AdherentForm auquel on ajoute une checkbox afin d'éviter les
doublons d'utilisateurs et, optionnellement, doublons d'utilisateurs et, optionnellement,
un champ mot de passe""" un champ mot de passe"""
if OptionalUser.get_cached_value("allow_set_password_during_user_creation"): # Champ pour choisir si un lien est envoyé par mail pour le mot de passe
# Champ pour choisir si un lien est envoyé par mail pour le mot de passe init_password_by_mail_info = _(
init_password_by_mail_info = _( "If this options is set, you will receive a link to set"
"If this options is set, you will receive a link to set" " your initial password by email. If you do not have"
" your initial password by email. If you do not have" " any means of accessing your emails, you can disable"
" any means of accessing your emails, you can disable" " this option to set your password immediatly."
" this option to set your password immediatly." " You will still receive an email to confirm your address."
" You will still receive an email to confirm your address." " Failure to confirm your address will result in an"
" Failure to confirm your address will result in an" " automatic suspension of your account until you do."
" automatic suspension of your account until you do." )
)
init_password_by_mail = forms.BooleanField( init_password_by_mail = forms.BooleanField(
help_text=init_password_by_mail_info, help_text=init_password_by_mail_info,
required=False, required=False,
initial=True initial=True
) )
init_password_by_mail.label = _("Send password reset link by email.") init_password_by_mail.label = _("Send password reset link by email.")
# Champs pour initialiser le mot de passe # Champs pour initialiser le mot de passe
# Validators are handled manually since theses fields aren't always required # Validators are handled manually since theses fields aren't always required
password1 = forms.CharField( password1 = forms.CharField(
required=False, required=False,
label=_("Password"), label=_("Password"),
widget=forms.PasswordInput, widget=forms.PasswordInput,
#validators=[MinLengthValidator(8)], #validators=[MinLengthValidator(8)],
max_length=255, max_length=255,
) )
password2 = forms.CharField( password2 = forms.CharField(
required=False, required=False,
label=_("Password confirmation"), label=_("Password confirmation"),
widget=forms.PasswordInput, widget=forms.PasswordInput,
#validators=[MinLengthValidator(8)], #validators=[MinLengthValidator(8)],
max_length=255, max_length=255,
) )
# Champ permettant d'éviter au maxium les doublons d'utilisateurs # Champ permettant d'éviter au maxium les doublons d'utilisateurs
former_user_check_info = _( former_user_check_info = _(
@ -481,6 +480,12 @@ class AdherentCreationForm(AdherentForm):
) )
) )
# Remove password fields if option is disabled
if not OptionalUser.get_cached_value("allow_set_password_during_user_creation"):
self.fields.pop("init_password_by_mail")
self.fields.pop("password1")
self.fields.pop("password2")
def clean_password1(self): def clean_password1(self):
"""Ignore ce champs si la case init_password_by_mail est décochée""" """Ignore ce champs si la case init_password_by_mail est décochée"""
send_email = self.cleaned_data.get("init_password_by_mail") send_email = self.cleaned_data.get("init_password_by_mail")