diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-02-13 13:23:29 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-02-13 13:23:29 +0100 |
| commit | bf6fa71e7f161896cd114a2033d7688f98d49f8e (patch) | |
| tree | aead69cdc27743add5535450c812c8ce9d440584 /archaeological_context_records | |
| parent | 5330e9b9622107a17a170cc2d3761dafbf15b8ae (diff) | |
| download | Ishtar-bf6fa71e7f161896cd114a2033d7688f98d49f8e.tar.bz2 Ishtar-bf6fa71e7f161896cd114a2033d7688f98d49f8e.zip | |
Manage search on json fields - HistorySelect for all concerned forms
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/forms.py | 6 | ||||
| -rw-r--r-- | archaeological_context_records/views.py | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 54ae74202..ae25e0abe 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -33,7 +33,7 @@ from archaeological_context_records import models from ishtar_common.forms import FinalForm, FormSet, \ reverse_lazy, get_form_selection, TableSelect, ManageOldType, CustomForm, \ - FieldType, CustomFormSearch, IshtarForm + FieldType, CustomFormSearch, IshtarForm, HistorySelect from ishtar_common.forms_common import get_town_field from archaeological_operations.forms import OperationSelect, ParcelField, \ RecordRelationsForm as OpeRecordRelationsForm, RecordRelationsFormSetBase @@ -58,11 +58,11 @@ class OperationFormSelection(CustomForm, forms.Form): validators=[valid_id(Operation)]) -class RecordSelect(CustomForm, TableSelect): +class RecordSelect(HistorySelect): _model = models.ContextRecord - form_admin_name = _(u"Context record - 001 - Search") form_slug = "contextrecord-001-search" + search_vector = forms.CharField( label=_(u"Full text search"), widget=widgets.SearchWidget( 'archaeological-context-records', 'contextrecord' diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index 6a01a48f0..ae07c4037 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -78,7 +78,9 @@ def autocomplete_contextrecord(request): get_contextrecord = get_item( models.ContextRecord, - 'get_contextrecord', 'contextrecord') + 'get_contextrecord', 'contextrecord', + search_form=forms.RecordSelect +) get_contextrecord_for_ope = get_item( models.ContextRecord, 'get_contextrecord', 'contextrecord', |