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

fix - change distribution lists & inventory entry

Browse Source
This commit is contained in:
Mojtaba-z
2025-11-02 13:45:54 +03:30
parent 47f9dc646b
commit 4ea8f77b58
4 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/product/web/api/v1/viewsets/quota_distribution_api.py
View File

@@ -95,36 +95,29 @@ class QuotaDistributionViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewS
def my_distributions(self, request):
""" list of my distributions """
queryset = self.filter_query(
self.get_queryset(visibility_by_org_scope=True)) # return by search param or all objects
organization = get_organization_by_user(request.user)
query = self.request.query_params
if query.get('param') == 'assigned':
# paginate queryset
page = self.paginate_queryset(
queryset.filter(
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
if query.get('param') == 'assigned':
queryset = queryset.filter(
Q(assigned_organization=organization)
).order_by('-modify_date')
)
elif query.get('param') == 'assigner':
# paginate queryset
page = self.paginate_queryset(
queryset.filter(
elif query.get('param') == 'assigner':
queryset = queryset.filter(
Q(assigner_organization=organization)
).order_by('-modify_date')
)
elif query.get('param') == 'all':
# paginate queryset
page = self.paginate_queryset(
queryset.filter(
elif query.get('param') == 'all':
queryset = queryset.filter(
Q(assigner_organization=organization) |
Q(assigned_organization=organization)
).order_by('-modify_date')
)
page = self.paginate_queryset(queryset)
if page is not None: # noqa
serializer = self.get_serializer(page, many=True) # noqa
return self.get_paginated_response(serializer.data)