code review on FindSelect Finds

4 files changed, 13 insertions, 20 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index f61bc5f35..a99d6fed4 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -977,6 +977,7 @@ class FindSelect(DocumentItemSelect, PeriodSelect):
             "base_finds__context_record__operation__person_in_charge",
             "base_finds__context_record__operation__common_name"
             "base_finds__context_record__operation__operator",
+            "base_finds__context_record__operation__address",
             "base_finds__context_record__town__areas",
             "archaeological_sites",
             "archaeological_sites_context_record",
@@ -1015,20 +1016,23 @@ class FindSelect(DocumentItemSelect, PeriodSelect):
         label=_("Full text search"), widget=widgets.SearchWidget(
             'archaeological-finds', 'find'
         ))
-    address = forms.CharField(label=_("Address"))
+    base_finds__context_record__operation__address = forms.CharField(label=_("Address"))
     base_finds__context_record__operation__person_in_charge = forms.IntegerField(
         label=_("Person in charge"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy("autocomplete-person")
-        ),
+        )
     )
     base_finds__context_record__operation__operator = forms.IntegerField(
         label=_("Operator"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy("autocomplete-organization")
-        ),
+        )
+    )
+    base_finds__context_record__operation__common_name = forms.CharField(
+        label=_("Operation name"),
+        max_length=30
     )
-    base_finds__context_record__operation__common_name = forms.CharField(label=_("Operation name"))
     label = forms.CharField(label=_("Free ID"))
     denomination = forms.CharField(label=_("Denomination"))
     previous_id = forms.CharField(label=_("Previous ID"))
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 36fcb7be6..c32a72f93 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1579,12 +1579,13 @@ class Find(
             pgettext_lazy("key for text search", "functional-area"),
             "functional_areas__label__iexact",
         ),
-        "address": SearchAltName(
-            pgettext_lazy("key for text search", "address"), "address__icontains"
+        "base_finds__context_record__operation__address": SearchAltName(
+            pgettext_lazy("key for text search", "operation-address"),
+            "base_finds__context_record__operation__address__iexact",
         ),
         "base_finds__context_record__operation__person_in_charge": SearchAltName(
             pgettext_lazy("key for text search", "person-in-charge"),
-            "base_finds__context_record__operation__person_in_charge__cached_label__iexact",
+            "base_finds__context_record__operation__in_charge__cached_label__iexact",
         ),
         "base_finds__context_record__operation__operator": SearchAltName(
             pgettext_lazy("key for text search", "operator"),
@@ -1592,7 +1593,7 @@ class Find(
         ),
         "base_finds__context_record__operation__common_name": SearchAltName(
             pgettext_lazy("key for text search", "operation-name"),
-            "base_finds__context_record__operation__common_name__cached_label__icontains",
+            "base_finds__context_record__operation__common_name__icontains",
         ),
     }
     ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES)
diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py
index f70bf5595..6638140d6 100644
--- a/archaeological_warehouse/forms.py
+++ b/archaeological_warehouse/forms.py
@@ -143,14 +143,6 @@ class WarehouseSelect(CustomForm, TableSelect):
     name = forms.CharField(label=_("Name"))
     warehouse_type = forms.ChoiceField(label=_("Warehouse type"), choices=[])
     town = get_town_field(label=_("Town"))
-    person_in_charge = forms.IntegerField(
-        label=_("Person in charge"),
-        widget=widgets.JQueryAutoComplete(
-          reverse_lazy("autocomplete-person"), associated_model=Person
-        ),
-        validators=[valid_id(Person)],
-    )
-
 
     def __init__(self, *args, **kwargs):
         super(WarehouseSelect, self).__init__(*args, **kwargs)
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index 370fbd304..f84a2d75b 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -315,10 +315,6 @@ class Warehouse(
             pgettext_lazy("key for text search", "town"),
             "precise_town__cached_label__iexact",
         ),
-        "person_in_charge": SearchAltName(
-            pgettext_lazy("key for text search", "person-in-charge"),
-            "person_in_charge__cached_label__icontains",
-        ),
     }
     GEO_LABEL = "name"
     DOWN_MODEL_UPDATE = ["containers"]