diff options
| -rw-r--r-- | archaeological_files/forms.py | 4 | ||||
| -rw-r--r-- | archaeological_files/views.py | 1 | ||||
| -rw-r--r-- | archaeological_operations/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html | 2 | ||||
| -rw-r--r-- | archaeological_operations/views.py | 2 |
5 files changed, 11 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': diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 3feaedfab..2ee6d371f 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -1052,6 +1052,8 @@ class AdministrativeActOpeSelect(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_operations/templates/ishtar/blocks/window_tables/administrativacts.html b/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html index 0be468b59..426669cca 100644 --- a/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html +++ b/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html @@ -5,12 +5,14 @@ <th>{% trans "Ref." %}</th> <th>{% trans "Type" %}</th> <th>{% trans "Date" %}</th> + <th>{% trans "Object" %}</th> </tr> {% for act in data %} <tr> <td>{{act.full_ref}}</td> <td class='string'>{{act.act_type}}</td> <td>{{act.signature_date}}</td> + <td>{{act.act_object}}</td> </tr> {% empty %} <tr><td colspan="4" class='no_items'>{% trans "No administrative act associated" %}</td></tr> diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index bde48b1b6..8d15c80ee 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -166,6 +166,7 @@ get_administrativeactop = get_item( 'operation__towns': 'operation__towns__pk', 'act_type__intented_to': 'act_type__intented_to', 'year': 'signature_date__year', + 'act_object': 'act_object__icontains', 'history_creator': 'history_creator__ishtaruser__person__pk', 'operation__towns__numero_insee__startswith': @@ -180,6 +181,7 @@ get_administrativeact = get_item( 'indexed': 'index__isnull', 'history_creator': 'history_creator__ishtaruser__person__pk', + 'act_object': 'act_object__icontains', 'operation__towns__numero_insee__startswith': 'operation__towns__numero_insee__startswith', 'operation__towns': 'operation__towns__pk'}, |