summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-01-28 16:50:07 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-01-28 16:50:07 +0100
commitc31e7d69af0ed9a223ff0319d9d004549e500f4a (patch)
tree9b9669a93158fd946be8d4f655a81bf4f5339951
parent9f9afced817b6f663d4edc8856556b55b2e294b6 (diff)
downloadIshtar-c31e7d69af0ed9a223ff0319d9d004549e500f4a.tar.bz2
Ishtar-c31e7d69af0ed9a223ff0319d9d004549e500f4a.zip
Search by department for archaeological files
-rw-r--r--archaeological_files/forms.py7
-rw-r--r--archaeological_files/views.py2
2 files changed, 9 insertions, 0 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index 9d317db1f..42b3f6b6f 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -53,6 +53,9 @@ class FileSelect(TableSelect):
internal_reference = forms.CharField(max_length=200,
label=_("Other reference"))
towns = get_town_field()
+ if settings.ISHTAR_DPTS:
+ towns__numero_insee__startswith = forms.ChoiceField(
+ label="Department", choices=[])
name = forms.CharField(label=_(u"File name"), max_length=200)
file_type = forms.ChoiceField(label=_("File type"), choices=[])
saisine_type = forms.ChoiceField(label=_("Saisine type"), choices=[])
@@ -95,6 +98,10 @@ class FileSelect(TableSelect):
self.fields['saisine_type'].help_text = models.SaisineType.get_help()
self.fields['file_type'].choices = models.FileType.get_types()
self.fields['file_type'].help_text = models.FileType.get_help()
+ if settings.ISHTAR_DPTS:
+ k = 'towns__numero_insee__startswith'
+ self.fields[k].choices = [
+ ('', '--')] + list(settings.ISHTAR_DPTS)
def get_input_ids(self):
ids = super(FileSelect, self).get_input_ids()
diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index 9b2044ecc..e31cd00b8 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -86,6 +86,8 @@ get_file = get_item(
'parcel_1': ('parcels__parcel_number',
'operations__parcels__parcel_number'),
'end_date': 'end_date__isnull',
+ 'towns__numero_insee__startswith':
+ 'towns__numero_insee__startswith',
'name': 'name__icontains',
'permit_reference': 'permit_reference__icontains',
'general_contractor__attached_to':