From 8b116164320adbcefab1f5a10a4a401f897ef578 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 22 Aug 2016 16:27:22 +0200 Subject: Closing date: force today at the initialisation of the form (refs #2212) --- ishtar_common/forms.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'ishtar_common/forms.py') diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py index bf19dbc49..89df1b1a5 100644 --- a/ishtar_common/forms.py +++ b/ishtar_common/forms.py @@ -122,8 +122,14 @@ def get_now(): class ClosingDateFormSelection(forms.Form): form_label = _("Closing date") end_date = forms.DateField(label=_(u"Closing date"), - widget=widgets.JQueryDate, - initial=datetime.date.today) + widget=widgets.JQueryDate) + + def __init__(self, *args, **kwargs): + if 'initial' not in kwargs: + kwargs['initial'] = {} + if not kwargs['initial'].get('end_date', None): + kwargs['initial']['end_date'] = datetime.date.today() + super(ClosingDateFormSelection, self).__init__(*args, **kwargs) def get_form_selection( -- cgit v1.2.3