summaryrefslogtreecommitdiff
path: root/archaeological_files
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-12-28 12:31:25 +0100
committerÉtienne Loks <etienne.loks@proxience.com>2015-12-28 12:31:25 +0100
commit794aa547ae60ffc5016fed4663c3a9463e5830dd (patch)
treee012fc3ca4027faa4be60c2bc67217339e2ee742 /archaeological_files
parentaf40ab0a860176686f2ad8f8b8bd0ec6fb29d510 (diff)
downloadIshtar-794aa547ae60ffc5016fed4663c3a9463e5830dd.tar.bz2
Ishtar-794aa547ae60ffc5016fed4663c3a9463e5830dd.zip
Administrativ act: display and search act's object
Diffstat (limited to 'archaeological_files')
-rw-r--r--archaeological_files/forms.py4
-rw-r--r--archaeological_files/views.py1
2 files changed, 5 insertions, 0 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index a8dd99135..8c360e364 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -379,6 +379,8 @@ class AdministrativeActFileModifySelect(TableSelect):
ref_sra = forms.CharField(label=u"Référence SRA",
max_length=15)
act_type = forms.ChoiceField(label=_("Act type"), choices=[])
+ act_object = forms.CharField(label=_(u"Object (full text search)"),
+ max_length=300)
operation__towns = get_town_field()
if settings.ISHTAR_DPTS:
operation__towns__numero_insee__startswith = forms.ChoiceField(
@@ -442,6 +444,8 @@ class AdministrativeActFileSelect(TableSelect):
if settings.ISHTAR_DPTS:
operation__towns__numero_insee__startswith = forms.ChoiceField(
label=_(u"Department"), choices=[])
+ act_object = forms.CharField(label=_(u"Object (full text search)"),
+ max_length=300)
history_creator = forms.IntegerField(
label=_(u"Created by"),
widget=widgets.JQueryAutoComplete(
diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index ad6eff854..9b2044ecc 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -116,6 +116,7 @@ get_administrativeactfile = get_item(
'history_creator': 'history_creator__ishtaruser__person__pk',
'operation__towns': 'operation__towns__pk',
'act_type__intented_to': 'act_type__intented_to',
+ 'act_object': 'act_object__icontains',
'signature_date_before': 'signature_date__lte',
'signature_date_after': 'signature_date__gte',
'associated_file__general_contractor__attached_to':