From b1f5bad2ddaebe2dd9943333d7efd131f63896e9 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 16 Aug 2016 16:57:14 +0200 Subject: Account management: fix edit - can delete an account (refs #2977) --- ishtar_common/widgets.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ishtar_common/widgets.py') diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py index 6d9600d0c..83fb23caf 100644 --- a/ishtar_common/widgets.py +++ b/ishtar_common/widgets.py @@ -539,7 +539,9 @@ class JQueryJqGrid(forms.RadioSelect): col_names = [col_names] for col_name in col_names: field = self.associated_model - keys = col_name.split('.') + keys = col_name.split('__') + if '.' in col_name: + keys = col_name.split('.') f_name = '' for key in keys: if hasattr(field, 'rel') and field.rel: -- cgit v1.2.3 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) --- archaeological_files/templates/ishtar/sheet_file.html | 4 ++-- ishtar_common/forms.py | 3 ++- ishtar_common/widgets.py | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'ishtar_common/widgets.py') diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 7a6120e42..a5879b3ec 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -37,8 +37,8 @@

{% if item.history_date %}{{ item.history_date }}{% else %}{{ item.history.all.0.history_date }}{% endif %}

-{% field "Reception date" item.reception_date %} -{% field "Creation date" item.creation_date %} +{% field "Reception date" item.reception_date|date:"DATE_FORMAT" %} +{% field "Creation date" item.creation_date|date:"DATE_FORMAT" %} {% field "Created by" item.history_creator.ishtaruser.full_label %} {% comment %} 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