Skip to content
Snippets Groups Projects
Unverified Commit 01448b21 authored by florimondmanca's avatar florimondmanca
Browse files

fix bug when submitting some empty fields in visit admin form

parent 34e7474c
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ class RegistrationsOpenFilter(admin.SimpleListFilter): ...@@ -16,7 +16,7 @@ class RegistrationsOpenFilter(admin.SimpleListFilter):
https://docs.djangoproject.com/fr/2.0/ref/contrib/admin/#django.contrib.admin.ModelAdmin.list_filter https://docs.djangoproject.com/fr/2.0/ref/contrib/admin/#django.contrib.admin.ModelAdmin.list_filter
""" """
title = "état des inscriptions" title = 'état des inscriptions'
parameter_name = 'registrations_open' parameter_name = 'registrations_open'
def lookups(self, request, model_admin): def lookups(self, request, model_admin):
...@@ -47,18 +47,22 @@ class VisitForm(forms.ModelForm): ...@@ -47,18 +47,22 @@ class VisitForm(forms.ModelForm):
- Deadline must be before the date - Deadline must be before the date
- End time must be after start time - End time must be after start time
Keep in mind that values may be `None` if not provided in the form.
""" """
cleaned_data = super().clean() cleaned_data = super().clean()
date = cleaned_data.get('date') date = cleaned_data.get('date')
deadline = cleaned_data.get('deadline') deadline = cleaned_data.get('deadline')
start_time = cleaned_data.get('start_time') start_time = cleaned_data.get('start_time')
end_time = cleaned_data.get('end_time') end_time = cleaned_data.get('end_time')
if deadline is not None:
if deadline.date() >= date: if deadline.date() >= date:
error = forms.ValidationError( error = forms.ValidationError(
"La date limite d'inscription doit être avant la " "La date limite d'inscription doit être avant la "
"date de la sortie." "date de la sortie."
) )
self.add_error('deadline', error) self.add_error('deadline', error)
if end_time is not None and start_time is not None:
if end_time <= start_time: if end_time <= start_time:
error = forms.ValidationError( error = forms.ValidationError(
"L'heure de fin doit être après l'heure de début.") "L'heure de fin doit être après l'heure de début.")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment