fix - change distribution lists & inventory entry
This commit is contained in:
@@ -16,7 +16,7 @@ from common.helpers import get_organization_by_user
|
||||
from common.liara_tools import upload_to_liara
|
||||
|
||||
|
||||
class InventoryEntryViewSet(SoftDeleteMixin, viewsets.ModelViewSet, DynamicSearchMixin):
|
||||
class InventoryEntryViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, DynamicSearchMixin):
|
||||
queryset = warehouse_models.InventoryEntry.objects.all()
|
||||
serializer_class = warehouse_serializers.InventoryEntrySerializer
|
||||
# filter_backends = [filters.SearchFilter]
|
||||
@@ -115,12 +115,15 @@ class InventoryEntryViewSet(SoftDeleteMixin, viewsets.ModelViewSet, DynamicSearc
|
||||
def my_inventory_entries(self, request):
|
||||
""" list of my inventory entries """
|
||||
|
||||
entries = self.queryset.filter(organization=get_organization_by_user(request.user))
|
||||
org = get_organization_by_user(request.user)
|
||||
entries = self.get_queryset(
|
||||
visibility_by_org_scope=True
|
||||
) if org.free_visibility_by_scope else self.get_queryset().filter(organization=org)
|
||||
queryset = self.filter_query(entries) # return by search param or all objects
|
||||
|
||||
# paginate & response
|
||||
page = self.paginate_queryset(queryset)
|
||||
if page is not None:
|
||||
if page is not None: # noqa
|
||||
serializer = self.get_serializer(page, many=True)
|
||||
return self.get_paginated_response(serializer.data)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user