From e26128e88686147902a6e6924f5814c020b79c93 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 17 Dec 2013 03:08:34 +0100 Subject: Search files: add activ criteria on search (refs #1405) --- archaeological_files/forms.py | 1 + archaeological_files/views.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index fcc62b39d..bd0d246f2 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -52,6 +52,7 @@ class FileSelect(TableSelect): saisine_type = forms.ChoiceField(label=_("Saisine type"), choices=[]) year = forms.IntegerField(label=_("Year")) parcel = ParcelField(label=_("Parcel (section/number)")) + end_date = forms.NullBooleanField(label=_(u"Is active?"), initial=True) def __init__(self, *args, **kwargs): super(FileSelect, self).__init__(*args, **kwargs) diff --git a/archaeological_files/views.py b/archaeological_files/views.py index 3482b99c8..8fcde9ea0 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -61,10 +61,12 @@ def autocomplete_file(request): return HttpResponse(data, mimetype='text/plain') get_file = get_item(models.File, 'get_file', 'file', + bool_fields = ['end_date__isnull'], extra_request_keys={'parcel_0':('parcels__section', 'operations__parcels__section'), 'parcel_1':('parcels__parcel_number', 'operations__parcels__parcel_number'), + 'end_date':'end_date__isnull', }, ) show_file = show_item(models.File, 'file') -- cgit v1.2.3