From b372861ab197afeb69760373d316abf16ce5b58f Mon Sep 17 00:00:00 2001 From: Jillian Vogel Date: Thu, 8 Feb 2024 10:24:42 +1030 Subject: [PATCH] fix: Adds a check for the TaxonomyOrg.rel_type when serializing orgs --- .../content_tagging/rest_api/v1/serializers.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/openedx/core/djangoapps/content_tagging/rest_api/v1/serializers.py b/openedx/core/djangoapps/content_tagging/rest_api/v1/serializers.py index 7edcd22c2ecf..3e4d1a047a10 100644 --- a/openedx/core/djangoapps/content_tagging/rest_api/v1/serializers.py +++ b/openedx/core/djangoapps/content_tagging/rest_api/v1/serializers.py @@ -13,6 +13,8 @@ from organizations.models import Organization +from ...models import TaxonomyOrg + class TaxonomyOrgListQueryParamsSerializer(TaxonomyListQueryParamsSerializer): """ @@ -73,8 +75,11 @@ class TaxonomyOrgSerializer(TaxonomySerializer): def get_orgs(self, obj) -> list[str]: """ Return the list of orgs for the taxonomy. - """ - return [taxonomy_org.org.short_name for taxonomy_org in obj.taxonomyorg_set.all() if taxonomy_org.org] + """ + return [ + taxonomy_org.org.short_name for taxonomy_org in obj.taxonomyorg_set.all() + if taxonomy_org.org and taxonomy_org.rel_type == TaxonomyOrg.RelType.OWNER + ] def get_all_orgs(self, obj) -> bool: """ @@ -82,7 +87,7 @@ def get_all_orgs(self, obj) -> bool: """ is_all_orgs = False for taxonomy_org in obj.taxonomyorg_set.all(): - if taxonomy_org.org_id is None: + if taxonomy_org.org_id is None and taxonomy_org.rel_type == TaxonomyOrg.RelType.OWNER: return True return False