✨ templates: clean and add fields for operations (refs #6435)

1 files changed, 23 insertions, 2 deletions

diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index d3b1934e1..72ce12401 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -714,10 +714,19 @@ class BaseFind(
 
     def get_extra_values(self, prefix="", no_values=False, filtr=None, **kwargs):
         values = {}
+        kwargs["force_no_base_finds"] = True
         no_find = kwargs.get("no_find", False)
         if not filtr or prefix + "complete_id" in filtr:
             values[prefix + "complete_id"] = self.complete_id()
-        if no_find:
+        exclude = kwargs.get("exclude", [])
+        if (not filtr or prefix + "context_record" in filtr) and \
+                "context_record" not in exclude:
+            exclude.append("context_record")
+            kwargs["exclude"] = exclude
+            values[prefix + "context_record"] = self.context_record.get_values(
+                filtr=filtr, **kwargs
+            )
+        if no_find or "finds" in exclude:
             return values
         if not filtr or prefix + "finds" in filtr:
             kwargs["no_base_finds"] = True
@@ -2750,10 +2759,21 @@ class Find(
             ] = self.get_material_types_recommendations()
         if no_base_finds:
             return values
+
         # by default attach first basefind data
         bf = self.get_first_base_find()
         if not bf:
             return values
+        if not filtr:
+            filtr = []
+        exclude = kwargs.get("exclude", [])
+        exclude += [
+            e for e in ("finds", "base_find_finds", "find", "base_find_find")
+            if e not in exclude
+        ]
+        kwargs["exclude"] = exclude
+        kwargs["no_find"] = True
+
         alt_filtr = [k[len("base_find_"):] for k in filtr if k.startswith("base_find_")]
         alt_filtr += filtr
         v = bf.get_values(prefix=prefix, no_values=True, filtr=alt_filtr, **kwargs)
@@ -2766,7 +2786,8 @@ class Find(
         new_values.update(dict((('base_find_' + k, v) for k, v in v.items())))
         new_values.update(values)
         values = new_values
-        kwargs["no_find"] = True
+
+        # list all base finds if necessary
         values[prefix + "base_finds"] = [
             base_find.get_values(no_values=True, filtr=filtr, **kwargs)
             for base_find in self.base_finds.distinct().order_by("-pk").all()