From 340778ab2ab26be3ef872fd27505b817d7759379 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 24 Feb 2021 19:14:37 +0100 Subject: get_values: get containers from operation - material_types_code from finds --- archaeological_warehouse/models.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'archaeological_warehouse') diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index d049b8093..16bbaab40 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -1438,7 +1438,7 @@ class Container(DocumentItem, Merge, LightHistorizedItem, def get_material_types_code(self) -> str: """ - Return dash separated material type code inside a container + Return pipe separated material type code inside a container """ materials = set() for material in self.finds.exclude( @@ -1463,7 +1463,8 @@ class Container(DocumentItem, Merge, LightHistorizedItem, prefix=prefix, no_values=no_values, filtr=filtr, **kwargs) from_find = prefix.startswith("container_") or \ prefix.startswith("container_ref_") - if (not filtr or prefix + 'finds' in filtr) and not from_find: + if (not filtr or prefix + 'finds' in filtr) and not from_find and \ + "finds" not in kwargs.get("exclude", []): kwargs["exclude"] = [prefix + "container", prefix + "container_ref"] # prevent recursive call values[prefix + 'finds'] = [ -- cgit v1.2.3