From c25cb9e1f5749b4dd071c873b94fd1e5be1193bd Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Jun 2022 16:03:02 +0200 Subject: [PATCH 1/2] fixed missing "parent" in fields --- openpype/client/entities.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/openpype/client/entities.py b/openpype/client/entities.py index a56288c1e8..1bfab5ad57 100644 --- a/openpype/client/entities.py +++ b/openpype/client/entities.py @@ -23,7 +23,7 @@ def _get_project_connection(project_name=None): return mongodb -def _prepare_fields(fields): +def _prepare_fields(fields, ensure_fields=None): if not fields: return None @@ -33,6 +33,10 @@ def _prepare_fields(fields): } if "_id" not in output: output["_id"] = True + + if ensure_fields: + for key in ensure_fields: + output[key] = True return output @@ -655,9 +659,8 @@ def get_last_versions(project_name, subset_ids, fields=None): doc["_version_id"] for doc in conn.aggregate(_pipeline) ] - fields = _prepare_fields(fields) - if fields and "parent" not in fields: - fields.append("parent") + + fields = _prepare_fields(fields, ["parent"]) version_docs = get_versions( project_name, version_ids=version_ids, fields=fields From 67532139b989f6e831400a12c21dab33516d3004 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Jun 2022 16:05:00 +0200 Subject: [PATCH 2/2] changed variable name to required_fields --- openpype/client/entities.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openpype/client/entities.py b/openpype/client/entities.py index 1bfab5ad57..cc4032712c 100644 --- a/openpype/client/entities.py +++ b/openpype/client/entities.py @@ -23,7 +23,7 @@ def _get_project_connection(project_name=None): return mongodb -def _prepare_fields(fields, ensure_fields=None): +def _prepare_fields(fields, required_fields=None): if not fields: return None @@ -34,8 +34,8 @@ def _prepare_fields(fields, ensure_fields=None): if "_id" not in output: output["_id"] = True - if ensure_fields: - for key in ensure_fields: + if required_fields: + for key in required_fields: output[key] = True return output