From a16d70575ce1cfef22a8c59093de49853460affc Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 21 Aug 2016 19:07:09 +0200 Subject: Closing operation or archaelogical file: today by default (refs #2212) --- ishtar_common/forms.py | 3 ++- ishtar_common/widgets.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'ishtar_common') diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py index 2e170fd1e..bf19dbc49 100644 --- a/ishtar_common/forms.py +++ b/ishtar_common/forms.py @@ -122,7 +122,8 @@ def get_now(): class ClosingDateFormSelection(forms.Form): form_label = _("Closing date") end_date = forms.DateField(label=_(u"Closing date"), - widget=widgets.JQueryDate) + widget=widgets.JQueryDate, + initial=datetime.date.today) def get_form_selection( diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py index 83fb23caf..89eead988 100644 --- a/ishtar_common/widgets.py +++ b/ishtar_common/widgets.py @@ -144,6 +144,8 @@ class JQueryDate(forms.TextInput): self.attrs['class'] = 'date-pickup' def render(self, name, value=None, attrs=None): + if value: + value = unicode(value) # very specific... if settings.COUNTRY == 'fr' and value and '/' in value: values = value.split('/') -- cgit v1.2.3