Merge branch 'develop' into release/3.14.x

This commit is contained in:
Ondřej Samohel 2022-08-18 16:15:45 +02:00
commit 7e7cb8da60
No known key found for this signature in database
GPG key ID: 02376E18990A97C6
4 changed files with 74 additions and 48 deletions

View file

@ -1547,6 +1547,11 @@ def _load_representations_by_loader(loader, repre_contexts,
return
for repre_context in repre_contexts.values():
version_doc = repre_context["version"]
if version_doc["type"] == "hero_version":
version_name = "Hero"
else:
version_name = version_doc.get("name")
try:
if data_by_repre_id:
_id = repre_context["representation"]["_id"]
@ -1564,7 +1569,7 @@ def _load_representations_by_loader(loader, repre_contexts,
None,
repre_context["representation"]["name"],
repre_context["subset"]["name"],
repre_context["version"]["name"]
version_name
))
except Exception as exc:
@ -1577,7 +1582,7 @@ def _load_representations_by_loader(loader, repre_contexts,
formatted_traceback,
repre_context["representation"]["name"],
repre_context["subset"]["name"],
repre_context["version"]["name"]
version_name
))
return error_info