diff options
| -rw-r--r-- | archaeological_context_records/models.py | 2 | ||||
| -rw-r--r-- | archaeological_finds/forms.py | 9 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 11b7732f8..8395fb8fe 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -331,7 +331,7 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem, blank=True) cached_label = models.TextField(_(u"Cached name"), null=True, blank=True, db_index=True) - PARENT_SEARCH_VECTORS = ['operation'] + PARENT_SEARCH_VECTORS = ['operation', "archaeological_site"] BASE_SEARCH_VECTORS = ["cached_label", "label", "location", "town__name", "interpretation", "filling", "datings_comment", "identification__label", "activity__label", diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 2688a36d5..f814b7fb4 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, Area + SpatialReferenceSystem, Area, OperationType from ishtar_common.utils import convert_coordinates_to_point __all__ = [ @@ -413,6 +413,7 @@ class FindSelect(CustomForm, TableSelect): base_finds__cache_short_id = forms.CharField(label=_(u"Short ID")) base_finds__cache_complete_id = forms.CharField(label=_(u"Complete ID")) label = forms.CharField(label=_(u"Free ID")) + denomination = forms.CharField(label=_(u"Denomination")) base_finds__context_record__town = get_town_field() base_finds__context_record__operation__year = forms.IntegerField( label=_(u"Year")) @@ -423,6 +424,9 @@ class FindSelect(CustomForm, TableSelect): label=_(u"Code PATRIARCHE"), widget=OAWidget ) + base_finds__context_record__operation__operation_type = forms.ChoiceField( + label=_(u"Operation type"), choices=[] + ) base_finds__context_record__town__areas = forms.ChoiceField( label=_(u"Areas"), choices=[] ) @@ -477,7 +481,8 @@ class FindSelect(CustomForm, TableSelect): FieldType('integrities', models.IntegrityType), FieldType('remarkabilities', models.RemarkabilityType), FieldType('base_finds__context_record__town__areas', Area), - + FieldType('base_finds__context_record__operation__operation_type', + OperationType), ] def __init__(self, *args, **kwargs): diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 1da74b7a0..90df95530 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -679,6 +679,8 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms, 'base_finds__context_record__operation__year__contains', 'base_finds__context_record__operation': 'base_finds__context_record__operation__pk', + 'base_finds__context_record__operation__operation_type': + 'base_finds__context_record__operation__operation_type__pk', 'archaeological_sites': 'base_finds__context_record__operation__archaeological_sites__pk', 'base_finds__context_record__operation__code_patriarche': @@ -690,6 +692,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms, 'base_finds__find__description__icontains', 'base_finds__batch': 'base_finds__batch', 'basket': 'basket', + 'denomination': 'denomination', 'cached_label': 'cached_label__icontains', 'documents__image__isnull': 'documents__image__isnull', 'container__location': 'container__location__pk', |