summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-21 19:07:09 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-21 19:07:09 +0200
commit8e7b31d2ac9e17d988eaa0733bc1a01bacdaa17e (patch)
tree830452b7b659fb595a25c0ab07cc82543ad5e957 /ishtar_common
parent5a1f5af005507f6f7883ddc079b52086ef9baff5 (diff)
downloadIshtar-8e7b31d2ac9e17d988eaa0733bc1a01bacdaa17e.tar.bz2
Ishtar-8e7b31d2ac9e17d988eaa0733bc1a01bacdaa17e.zip
Closing operation or archaelogical file: today by default (refs #2212)
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/forms.py3
-rw-r--r--ishtar_common/widgets.py2
2 files changed, 4 insertions, 1 deletions
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('/')