diff options
| -rw-r--r-- | archaeological_finds/forms.py | 6 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 447d1064c..0e27b0303 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -35,7 +35,6 @@ from ishtar_common.utils import gettext_lazy as _ from . import models from archaeological_operations.models import CulturalAttributionType, RemainType from archaeological_context_records.models import ( - Dating, DatingType, DatingQuality, ContextRecord, @@ -1796,6 +1795,9 @@ class FindSelect(MuseumForm, GeoItemSelect, DatingSelect): "museum": [ "cache_complete_museum_id", "museum_id_comment", + "museum_id", + "museum_id_prefix", + "museum_id_suffix", "museum_owner_institution", "museum_assigned_institution", "museum_custodian_institution", @@ -1828,7 +1830,9 @@ class FindSelect(MuseumForm, GeoItemSelect, DatingSelect): ) label = forms.CharField(label=_("Free ID")) denomination = forms.CharField(label=_("Denomination")) + museum_id_prefix = forms.CharField(label=_("Museum ID prefix")) museum_id = forms.CharField(label=_("Museum inventory number")) + museum_id_suffix = forms.CharField(label=_("Museum ID suffix")) cache_complete_museum_id = forms.CharField(label=_("Complete museum ID")) previous_id = forms.CharField(label=_("Previous ID")) base_finds__excavation_id = forms.CharField(label=_("Excavation ID")) diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index fcc82dd60..e68b3c5fd 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1639,7 +1639,7 @@ class Find( "previous_id": SearchAltName( pgettext_lazy("key for text search", "previous-id"), "previous_id__iexact" ), - #'collection': + # 'collection': # SearchAltName( # pgettext_lazy("key for text search", "collection"), # 'collection__name__iexact'), @@ -1653,8 +1653,17 @@ class Find( "museum_id": SearchAltName( pgettext_lazy("key for text search", "museum-id"), "museum_id__iexact" ), + "museum_id_prefix": SearchAltName( + pgettext_lazy("key for text search", "museum-id-prefix"), + "museum_id_prefix__iexact" + ), + "museum_id_suffix": SearchAltName( + pgettext_lazy("key for text search", "museum-id-suffix"), + "museum_id_suffix__iexact" + ), "cache_complete_museum_id": SearchAltName( - pgettext_lazy("key for text search", "complete-museum-id"), "cache_complete_museum_id__iexact" + pgettext_lazy("key for text search", "complete-museum-id"), + "cache_complete_museum_id__iexact" ), "laboratory_id": SearchAltName( pgettext_lazy("key for text search", "laboratory-id"), |