From 91e86159e1c07a08c42811ac00e67ff9afd34870 Mon Sep 17 00:00:00 2001 From: Mojtaba-z Date: Tue, 18 Nov 2025 14:01:03 +0330 Subject: [PATCH] fix - list of active quotas by assigned orgs / registerer org --- apps/product/web/api/v1/viewsets/quota_api.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/product/web/api/v1/viewsets/quota_api.py b/apps/product/web/api/v1/viewsets/quota_api.py index 7248483..77ed4ef 100644 --- a/apps/product/web/api/v1/viewsets/quota_api.py +++ b/apps/product/web/api/v1/viewsets/quota_api.py @@ -353,16 +353,21 @@ class QuotaViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, DynamicS def active_quotas(self, request): """ list of organization active quotas """ + org = get_organization_by_user(request.user) + queryset = self.filter_query( self.get_queryset(visibility_by_org_scope=True).filter( is_closed=False)) # return by search param or all objects # paginate queryset page = self.paginate_queryset( - queryset.order_by('-modify_date').distinct() + queryset.filter( + Q(assigned_organizations=org) | + Q(registerer_organization=True) + ).order_by('-modify_date').distinct() ) if page is not None: # noqa - serializer = self.get_serializer(page, many=True, context={'org': get_organization_by_user(request.user)}) + serializer = self.get_serializer(page, many=True, context={'org': org}) return self.get_paginated_response(serializer.data) @action(