From 82e004166b86617373fad74a19e85bb3bd5f8496 Mon Sep 17 00:00:00 2001 From: Mojtaba-z Date: Wed, 5 Nov 2025 11:01:56 +0330 Subject: [PATCH] split my distributions by archive (is_closed) --- .../web/api/v1/viewsets/quota_distribution_api.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/product/web/api/v1/viewsets/quota_distribution_api.py b/apps/product/web/api/v1/viewsets/quota_distribution_api.py index ead7195..6fe6823 100644 --- a/apps/product/web/api/v1/viewsets/quota_distribution_api.py +++ b/apps/product/web/api/v1/viewsets/quota_distribution_api.py @@ -95,12 +95,12 @@ class QuotaDistributionViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewS def my_distributions(self, request): """ list of my distributions """ + query = self.request.query_params # noqa organization = get_organization_by_user(request.user) if organization.free_visibility_by_scope: queryset = self.filter_query(self.get_queryset(visibility_by_org_scope=True)) else: - queryset = self.filter_query(self.get_queryset()) # return by search param or all objects - query = self.request.query_params # noqa + queryset = self.filter_query(self.get_queryset()) # return by search param or all objects # noqa if query.get('param') == 'assigned': queryset = queryset.filter( Q(assigned_organization=organization) @@ -117,10 +117,10 @@ class QuotaDistributionViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewS Q(assigned_organization=organization) ).order_by('-modify_date') - if query.get('archive') and query.get('archive') == 'true': - queryset = queryset.filter(Q(quota__is_closed=True)) - else: - queryset = queryset.filter(Q(quota__is_closed=False)) + if query.get('archive') and query.get('archive') == 'true': + queryset = queryset.filter(Q(quota__is_closed=True)) + else: + queryset = queryset.filter(Q(quota__is_closed=False)) page = self.paginate_queryset(queryset) if page is not None: # noqa