From 0cc719e84b9feaa402977527acc9a1fbf95f5eb7 Mon Sep 17 00:00:00 2001 From: Mojtaba-z Date: Tue, 2 Dec 2025 16:51:39 +0330 Subject: [PATCH] fix - bug of quota with org context in distribution serializer --- .../api/v1/serializers/quota_distribution_serializers.py | 7 ++++++- apps/product/web/api/v1/viewsets/quota_api.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/product/web/api/v1/serializers/quota_distribution_serializers.py b/apps/product/web/api/v1/serializers/quota_distribution_serializers.py index 2d1e471..49337ec 100644 --- a/apps/product/web/api/v1/serializers/quota_distribution_serializers.py +++ b/apps/product/web/api/v1/serializers/quota_distribution_serializers.py @@ -124,8 +124,13 @@ class QuotaDistributionSerializer(serializers.ModelSerializer): many=True ).data + quota_serializer = QuotaSerializer( + quota, + context={'org': self.context['org']} + ).data if 'org' in self.context.keys() else QuotaSerializer(quota).data + if quota: - representation['quota'] = QuotaSerializer(quota).data + representation['quota'] = quota_serializer if assigned_org: representation['assigned_organization'] = { diff --git a/apps/product/web/api/v1/viewsets/quota_api.py b/apps/product/web/api/v1/viewsets/quota_api.py index fdfe219..0a4f970 100644 --- a/apps/product/web/api/v1/viewsets/quota_api.py +++ b/apps/product/web/api/v1/viewsets/quota_api.py @@ -459,7 +459,7 @@ class QuotaViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, DynamicS ) if page is not None: serializer = quota_distribution_serializers.QuotaDistributionSerializer( - page, many=True + page, many=True, context={'org': my_org} ) return self.get_paginated_response(serializer.data) except Exception as e: