split my distributions by archive (is_closed)
This commit is contained in:
@@ -95,12 +95,12 @@ class QuotaDistributionViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewS
|
|||||||
def my_distributions(self, request):
|
def my_distributions(self, request):
|
||||||
""" list of my distributions """
|
""" list of my distributions """
|
||||||
|
|
||||||
|
query = self.request.query_params # noqa
|
||||||
organization = get_organization_by_user(request.user)
|
organization = get_organization_by_user(request.user)
|
||||||
if organization.free_visibility_by_scope:
|
if organization.free_visibility_by_scope:
|
||||||
queryset = self.filter_query(self.get_queryset(visibility_by_org_scope=True))
|
queryset = self.filter_query(self.get_queryset(visibility_by_org_scope=True))
|
||||||
else:
|
else:
|
||||||
queryset = self.filter_query(self.get_queryset()) # return by search param or all objects
|
queryset = self.filter_query(self.get_queryset()) # return by search param or all objects # noqa
|
||||||
query = self.request.query_params # noqa
|
|
||||||
if query.get('param') == 'assigned':
|
if query.get('param') == 'assigned':
|
||||||
queryset = queryset.filter(
|
queryset = queryset.filter(
|
||||||
Q(assigned_organization=organization)
|
Q(assigned_organization=organization)
|
||||||
@@ -117,10 +117,10 @@ class QuotaDistributionViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewS
|
|||||||
Q(assigned_organization=organization)
|
Q(assigned_organization=organization)
|
||||||
).order_by('-modify_date')
|
).order_by('-modify_date')
|
||||||
|
|
||||||
if query.get('archive') and query.get('archive') == 'true':
|
if query.get('archive') and query.get('archive') == 'true':
|
||||||
queryset = queryset.filter(Q(quota__is_closed=True))
|
queryset = queryset.filter(Q(quota__is_closed=True))
|
||||||
else:
|
else:
|
||||||
queryset = queryset.filter(Q(quota__is_closed=False))
|
queryset = queryset.filter(Q(quota__is_closed=False))
|
||||||
|
|
||||||
page = self.paginate_queryset(queryset)
|
page = self.paginate_queryset(queryset)
|
||||||
if page is not None: # noqa
|
if page is not None: # noqa
|
||||||
|
|||||||
Reference in New Issue
Block a user