diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-06-13 17:31:13 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-06-13 17:31:13 +0200 |
| commit | bcda82df67ff32d946ba13769af90af4d53a4355 (patch) | |
| tree | 40e3e1ce072596d24f93f0e40a79631cf7a361d6 /archaeological_finds | |
| parent | d96282c864e81ac8501cfef67adf3d8b5d74cfa0 (diff) | |
| download | Ishtar-bcda82df67ff32d946ba13769af90af4d53a4355.tar.bz2 Ishtar-bcda82df67ff32d946ba13769af90af4d53a4355.zip | |
Manage area search for finds
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/forms.py | 6 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 41ecb5d31..2688a36d5 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -55,7 +55,7 @@ from ishtar_common.forms import CustomForm, CustomFormSearch, FormSet, \ ManageOldType, FieldType, IshtarForm, FormHeader from ishtar_common.forms_common import get_town_field from ishtar_common.models import valid_id, valid_ids, get_current_profile, \ - SpatialReferenceSystem + SpatialReferenceSystem, Area from ishtar_common.utils import convert_coordinates_to_point __all__ = [ @@ -423,6 +423,9 @@ class FindSelect(CustomForm, TableSelect): label=_(u"Code PATRIARCHE"), widget=OAWidget ) + base_finds__context_record__town__areas = forms.ChoiceField( + label=_(u"Areas"), choices=[] + ) archaeological_sites = forms.IntegerField( label=_("Archaeological site (attached to the operation)"), widget=widgets.JQueryAutoComplete( @@ -473,6 +476,7 @@ class FindSelect(CustomForm, TableSelect): FieldType('preservation_to_considers', models.TreatmentType), FieldType('integrities', models.IntegrityType), FieldType('remarkabilities', models.RemarkabilityType), + FieldType('base_finds__context_record__town__areas', Area), ] diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index bde4872a8..1da74b7a0 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -683,6 +683,8 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms, 'base_finds__context_record__operation__archaeological_sites__pk', 'base_finds__context_record__operation__code_patriarche': 'base_finds__context_record__operation__code_patriarche', + 'base_finds__context_record__town__areas': + 'base_finds__context_record__town__areas__pk', 'datings__period': 'datings__period__pk', 'base_finds__find__description': 'base_finds__find__description__icontains', |