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_files | |
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_files')
-rw-r--r-- | archaeological_files/forms.py | 6 | ||||
-rw-r--r-- | archaeological_files/views.py | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index b8f41b4c4..40404e6f8 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -37,7 +37,7 @@ from archaeological_operations.models import ActType, AdministrativeAct, \ import models from ishtar_common.forms import FinalForm, get_now, reverse_lazy, TableSelect, \ - ManageOldType, CustomForm, FieldType, IshtarForm + ManageOldType, CustomForm, FieldType, IshtarForm, HistorySelect from ishtar_common.forms_common import get_town_field from archaeological_operations.forms import AdministrativeActForm, \ AdministrativeActOpeFormSelection, SLICING, AdministrativeActModifForm, \ @@ -46,8 +46,10 @@ from ishtar_common import widgets from bootstrap_datepicker.widgets import DatePicker -class FileSelect(TableSelect): +class FileSelect(HistorySelect): _model = models.File + form_admin_name = _(u"File - 001 - Search") + form_slug = "file-001-search" search_vector = forms.CharField( label=_(u"Full text search"), widget=widgets.SearchWidget( diff --git a/archaeological_files/views.py b/archaeological_files/views.py index 9db2514af..c7a8830c8 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -75,7 +75,9 @@ def autocomplete_file(request): for file in files]) return HttpResponse(data, content_type='text/plain') -get_file = get_item(models.File, 'get_file', 'file') + +get_file = get_item(models.File, 'get_file', 'file', + search_form=FileSelect) revert_file = revert_item(models.File) |