mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-12-24 16:03:47 +00:00
Menage ordre des fonctions du forms de users
This commit is contained in:
parent
201b87f38e
commit
e0fc3d3846
1 changed files with 13 additions and 14 deletions
|
@ -324,14 +324,6 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
|
||||||
self.fields['room'].empty_label = _("No room")
|
self.fields['room'].empty_label = _("No room")
|
||||||
self.fields['school'].empty_label = _("Select a school")
|
self.fields['school'].empty_label = _("Select a school")
|
||||||
|
|
||||||
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(
|
|
||||||
_("You can't use a {} address.").format(
|
|
||||||
OptionalUser.objects.first().local_email_domain))
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Adherent
|
model = Adherent
|
||||||
fields = [
|
fields = [
|
||||||
|
@ -345,6 +337,19 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
|
||||||
'room',
|
'room',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
force = forms.BooleanField(
|
||||||
|
label=_("Force the move?"),
|
||||||
|
initial=False,
|
||||||
|
required=False
|
||||||
|
)
|
||||||
|
|
||||||
|
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(
|
||||||
|
_("You can't use a {} address.").format(
|
||||||
|
OptionalUser.objects.first().local_email_domain))
|
||||||
|
|
||||||
def clean_telephone(self):
|
def clean_telephone(self):
|
||||||
"""Verifie que le tel est présent si 'option est validée
|
"""Verifie que le tel est présent si 'option est validée
|
||||||
|
@ -356,12 +361,6 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
|
||||||
)
|
)
|
||||||
return telephone
|
return telephone
|
||||||
|
|
||||||
force = forms.BooleanField(
|
|
||||||
label=_("Force the move?"),
|
|
||||||
initial=False,
|
|
||||||
required=False
|
|
||||||
)
|
|
||||||
|
|
||||||
def clean_force(self):
|
def clean_force(self):
|
||||||
"""On supprime l'ancien user de la chambre si et seulement si la
|
"""On supprime l'ancien user de la chambre si et seulement si la
|
||||||
case est cochée"""
|
case est cochée"""
|
||||||
|
|
Loading…
Reference in a new issue