MNPC/RasadDam_Backend
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix - list of active quotas by assigned orgs / registerer org

Browse Source
This commit is contained in:
Mojtaba-z
2025-11-18 14:01:03 +03:30
parent 87afa5bc5a
commit 91e86159e1
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/product/web/api/v1/viewsets/quota_api.py
View File

@@ -353,16 +353,21 @@ class QuotaViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, DynamicS
def active_quotas(self, request): def active_quotas(self, request):
""" list of organization active quotas """ """ list of organization active quotas """
org = get_organization_by_user(request.user)
queryset = self.filter_query( queryset = self.filter_query(
self.get_queryset(visibility_by_org_scope=True).filter( self.get_queryset(visibility_by_org_scope=True).filter(
is_closed=False)) # return by search param or all objects is_closed=False)) # return by search param or all objects
# paginate queryset # paginate queryset
page = self.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 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) return self.get_paginated_response(serializer.data)
@action( @action(