diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-03-11 13:27:04 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-03-11 13:27:04 +0100 |
| commit | 3fd126b25be6a50c49b4525941d216fa92f727b0 (patch) | |
| tree | c248b4e8b129d017373af2a07d399f5ca82717b1 /archaeological_files | |
| parent | 9429df335283ff6de8c0e21778bb0e7fbda6b149 (diff) | |
| download | Ishtar-3fd126b25be6a50c49b4525941d216fa92f727b0.tar.bz2 Ishtar-3fd126b25be6a50c49b4525941d216fa92f727b0.zip | |
Searc criteria: add has image/file/url criteria for all document items
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/forms.py | 6 | ||||
| -rw-r--r-- | archaeological_files/models.py | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index 9a2f63a1d..a9936c47a 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -37,8 +37,8 @@ from archaeological_operations.models import ActType, AdministrativeAct, \ from . import models from ishtar_common.forms import FinalForm, get_now, reverse_lazy, TableSelect, \ - ManageOldType, CustomForm, FieldType, IshtarForm, HistorySelect, \ - MultiSearchForm, LockForm, CustomFormSearch + ManageOldType, CustomForm, FieldType, IshtarForm, \ + MultiSearchForm, LockForm, CustomFormSearch, DocumentItemSelect from ishtar_common.forms_common import get_town_field from archaeological_operations.forms import AdministrativeActForm, \ AdministrativeActOpeFormSelection, SLICING, AdministrativeActModifForm, \ @@ -47,7 +47,7 @@ from ishtar_common import widgets from bootstrap_datepicker.widgets import DatePicker -class FileSelect(HistorySelect): +class FileSelect(DocumentItemSelect): _model = models.File form_admin_name = _(u"File - 001 - Search") form_slug = "file-001-search" diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 018b5d429..310301c59 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -161,6 +161,12 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter, 'towns_label': _(u"Towns"), } + REVERSED_BOOL_FIELDS = [ + 'documents__image__isnull', + 'documents__associated_file__isnull', + 'documents__associated_url__isnull', + ] + # alternative names of fields for searches ALT_NAMES = { 'year': SearchAltName( @@ -230,6 +236,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter, ), } ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES) + ALT_NAMES.update(DocumentItem.ALT_NAMES) POST_PROCESS_REQUEST = { 'towns__numero_insee__startswith': '_get_department_code', |