From 12b6f0d4885c8af6e279d657d886ede364bea68a Mon Sep 17 00:00:00 2001 From: Bartuccio Antoine Date: Sat, 5 Oct 2019 23:24:31 +0200 Subject: [PATCH] django2.2: adapt DateTimeField in forms with the new API --- club/forms.py | 4 ++-- com/views.py | 13 ++++++++----- counter/views.py | 4 ++-- election/views.py | 11 +++++++---- subscription/views.py | 4 ++-- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/club/forms.py b/club/forms.py index dca2b05c..791cd1fc 100644 --- a/club/forms.py +++ b/club/forms.py @@ -159,13 +159,13 @@ class MailingForm(forms.Form): class SellingsFormBase(forms.Form): begin_date = forms.DateTimeField( - ["%Y-%m-%d %H:%M:%S"], + input_formats=["%Y-%m-%d %H:%M:%S"], label=_("Begin date"), required=False, widget=SelectDateTime, ) end_date = forms.DateTimeField( - ["%Y-%m-%d %H:%M:%S"], + input_formats=["%Y-%m-%d %H:%M:%S"], label=_("End date"), required=False, widget=SelectDateTime, diff --git a/com/views.py b/com/views.py index dd972522..be6314ce 100644 --- a/com/views.py +++ b/com/views.py @@ -74,14 +74,14 @@ class PosterForm(forms.ModelForm): widgets = {"screens": forms.CheckboxSelectMultiple} date_begin = forms.DateTimeField( - ["%Y-%m-%d %H:%M:%S"], + input_formats=["%Y-%m-%d %H:%M:%S"], label=_("Start date"), widget=SelectDateTime, required=True, initial=timezone.now().strftime("%Y-%m-%d %H:%M:%S"), ) date_end = forms.DateTimeField( - ["%Y-%m-%d %H:%M:%S"], + input_formats=["%Y-%m-%d %H:%M:%S"], label=_("End date"), widget=SelectDateTime, required=False, @@ -200,19 +200,22 @@ class NewsForm(forms.ModelForm): } start_date = forms.DateTimeField( - ["%Y-%m-%d %H:%M:%S"], + input_formats=["%Y-%m-%d %H:%M:%S"], label=_("Start date"), widget=SelectDateTime, required=False, ) end_date = forms.DateTimeField( - ["%Y-%m-%d %H:%M:%S"], + input_formats=["%Y-%m-%d %H:%M:%S"], label=_("End date"), widget=SelectDateTime, required=False, ) until = forms.DateTimeField( - ["%Y-%m-%d %H:%M:%S"], label=_("Until"), widget=SelectDateTime, required=False + input_formats=["%Y-%m-%d %H:%M:%S"], + label=_("Until"), + widget=SelectDateTime, + required=False, ) automoderation = forms.BooleanField(label=_("Automoderation"), required=False) diff --git a/counter/views.py b/counter/views.py index 7f72434e..48ebd74b 100644 --- a/counter/views.py +++ b/counter/views.py @@ -1554,13 +1554,13 @@ class CashSummaryEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView): class CashSummaryFormBase(forms.Form): begin_date = forms.DateTimeField( - ["%Y-%m-%d %H:%M:%S"], + input_formats=["%Y-%m-%d %H:%M:%S"], label=_("Begin date"), required=False, widget=SelectDateTime, ) end_date = forms.DateTimeField( - ["%Y-%m-%d %H:%M:%S"], + input_formats=["%Y-%m-%d %H:%M:%S"], label=_("End date"), required=False, widget=SelectDateTime, diff --git a/election/views.py b/election/views.py index c142e6d0..22971b62 100644 --- a/election/views.py +++ b/election/views.py @@ -181,22 +181,25 @@ class ElectionForm(forms.ModelForm): ) start_date = forms.DateTimeField( - ["%Y-%m-%d %H:%M:%S"], + input_formats=["%Y-%m-%d %H:%M:%S"], label=_("Start date"), widget=SelectDateTime, required=True, ) end_date = forms.DateTimeField( - ["%Y-%m-%d %H:%M:%S"], label=_("End date"), widget=SelectDateTime, required=True + input_formats=["%Y-%m-%d %H:%M:%S"], + label=_("End date"), + widget=SelectDateTime, + required=True, ) start_candidature = forms.DateTimeField( - ["%Y-%m-%d %H:%M:%S"], + input_formats=["%Y-%m-%d %H:%M:%S"], label=_("Start candidature"), widget=SelectDateTime, required=True, ) end_candidature = forms.DateTimeField( - ["%Y-%m-%d %H:%M:%S"], + input_formats=["%Y-%m-%d %H:%M:%S"], label=_("End candidature"), widget=SelectDateTime, required=True, diff --git a/subscription/views.py b/subscription/views.py index 1949c2a5..45e04a55 100644 --- a/subscription/views.py +++ b/subscription/views.py @@ -42,13 +42,13 @@ class SelectionDateForm(forms.Form): def __init__(self, *args, **kwargs): super(SelectionDateForm, self).__init__(*args, **kwargs) self.fields["start_date"] = forms.DateTimeField( - ["%Y-%m-%d %H:%M:%S"], + input_formats=["%Y-%m-%d %H:%M:%S"], label=_("Start date"), widget=SelectDateTime, required=True, ) self.fields["end_date"] = forms.DateTimeField( - ["%Y-%m-%d %H:%M:%S"], + input_formats=["%Y-%m-%d %H:%M:%S"], label=_("End date"), widget=SelectDateTime, required=True,