Search - Container: search by parent container

4 files changed, 23 insertions, 3 deletions

diff --git a/CHANGES.md b/CHANGES.md
index f1cd13d3f..e8acd2cfa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,12 @@
 Ishtar changelog
 ================
 
+v3.1.24 - 2021-05-25
+--------------------
+
+### Features ###
+- Search: Container - search by parent
+
 v3.1.23 - 2021-05-11
 --------------------
 
diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py
index 9bc6de5b0..6638140d6 100644
--- a/archaeological_warehouse/forms.py
+++ b/archaeological_warehouse/forms.py
@@ -82,7 +82,7 @@ from archaeological_finds.forms import FindMultipleFormSelection, SelectFindBask
 
 
 def get_warehouse_field(label=_("Warehouse"), required=True):
-    # !FIXME hard_link, reverse_lazy doen't seem to work with formsets
+    # !FIXME hard_link, reverse_lazy doesn't seem to work with formsets
     url = "/" + settings.URL_PATH + "autocomplete-warehouse"
     widget = widgets.JQueryAutoComplete(url, associated_model=models.Warehouse)
     return forms.IntegerField(
@@ -497,6 +497,16 @@ class ContainerSelect(DocumentItemSelect):
     contain_containers = forms.NullBooleanField(label=_("Contain containers"))
     empty = forms.NullBooleanField(label=_("Currently empty"))
     is_stationary = forms.NullBooleanField(label=_("Is stationary"))
+    parent = forms.IntegerField(
+        label=_("Parent container"),
+        widget=widgets.JQueryAutoComplete(
+            reverse_lazy("autocomplete-container"),
+            associated_model=models.Container,
+            dynamic_limit=["location"],
+        ),
+        validators=[valid_id(models.Container)],
+        required=False,
+    )
 
     archaeological_sites = forms.IntegerField(
         label=_("Archaeological site (attached to the operation)"),
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index b4bf8c5ea..2e9a57f76 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -935,6 +935,10 @@ class Container(
             "finds__description__iexact",
         ),
         "empty": SearchAltName(pgettext_lazy("key for text search", "empty"), "finds"),
+        "parent": SearchAltName(
+            pgettext_lazy("key for text search", "parent-container"),
+            "parent__cached_label__iexact"
+        ),
         "contain_containers": SearchAltName(
             pgettext_lazy("key for text search", "contain-containers"),
             "children__isnull",
diff --git a/ishtar_common/version.py b/ishtar_common/version.py
index 5f7cfd3e7..f4c5beed5 100644
--- a/ishtar_common/version.py
+++ b/ishtar_common/version.py
@@ -1,5 +1,5 @@
-# 3.1.23
-VERSION = (3, 1, 23)
+# 3.1.24
+VERSION = (3, 1, 24)
 
 
 def get_version():