✨ find criteria search - warehouse town of find's containers

2 files changed, 17 insertions, 22 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 1c557c2d5..58869d108 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -2263,18 +2263,10 @@ class FindSelectWarehouseModule(FindSelect):
         ),
         validators=[valid_id(Warehouse)],
     )
-    """
-    container_ref__responsible = forms.IntegerField(
-        label=_("Reference container - Warehouse (responsible)"),
-        widget=widgets.JQueryAutoComplete(
-            reverse_lazy('autocomplete-warehouse'),
-            associated_model=Warehouse),
-        validators=[valid_id(Warehouse)])
-    container_ref__index = forms.IntegerField(
-        label=_("Reference container ID"))
-    container_ref__reference = forms.CharField(
-        label=_("Reference container ref."))
-    """
+    container_ref__location__cached_town = get_town_field(
+        label=_("Reference container - Warehouse (location) - Town"),
+        simple=True
+    )
     container = forms.IntegerField(
         label=_("Current container"),
         widget=widgets.JQueryAutoComplete(
@@ -2289,16 +2281,10 @@ class FindSelectWarehouseModule(FindSelect):
         ),
         validators=[valid_id(Warehouse)],
     )
-    """
-    container__responsible = forms.IntegerField(
-        label=_("Current container - Warehouse (responsible)"),
-        widget=widgets.JQueryAutoComplete(
-            reverse_lazy('autocomplete-warehouse'),
-            associated_model=Warehouse),
-        validators=[valid_id(Warehouse)])
-    container__index = forms.IntegerField(label=_("Current container ID"))
-    container__reference = forms.CharField(label=_("Current container ref."))
-    """
+    container__location__cached_town = get_town_field(
+        label=_("Current container - Warehouse (location) - Town"),
+        simple=True
+    )
 
 
 class FindFormSelection(LockForm, CustomFormSearch):
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index a6f1263e1..dc62789d5 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1658,10 +1658,19 @@ class Find(
             pgettext_lazy("key for text search", "location"),
             "container_ref__location__name__iexact",
         ),
+        "container_ref__location__cached_town": SearchAltName(
+            pgettext_lazy("key for text search", "container-location-town"),
+            "container_ref__location__cached_town__iexact",
+        ),
         "container__location": SearchAltName(
             pgettext_lazy("key for text search", "current-location"),
             "container__location__name__iexact",
         ),
+        "container__location__cached_town": SearchAltName(
+            pgettext_lazy("key for text search",
+                          "current-container-location-town"),
+            "container__location__cached_town__iexact",
+        ),
         "container": SearchAltName(
             pgettext_lazy("key for text search", "current-container"),
             "container__cached_label__iexact",