fix-my devices - import new mixin of visible orgs
This commit is contained in:
@@ -18,6 +18,7 @@ from apps.authentication.api.v1.api import (
|
||||
from apps.authentication.exceptions import OrganizationBankAccountException
|
||||
from apps.authorization.api.v1.serializers import UserRelationSerializer
|
||||
from apps.authorization.models import UserRelations
|
||||
from apps.core.api import BaseViewSet
|
||||
from apps.core.mixins.admin_mixin import AdminFilterMixin
|
||||
from apps.core.mixins.search_mixin import DynamicSearchMixin
|
||||
from apps.core.mixins.soft_delete_mixin import SoftDeleteMixin
|
||||
@@ -65,7 +66,7 @@ class ProviderCompanyViewSet(SoftDeleteMixin, viewsets.ModelViewSet): # noqa
|
||||
return self.get_paginated_response(serializer.data)
|
||||
|
||||
|
||||
class DeviceViewSet(SoftDeleteMixin, viewsets.ModelViewSet, AdminFilterMixin):
|
||||
class DeviceViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, AdminFilterMixin):
|
||||
queryset = pos_models.Device.objects.all()
|
||||
serializer_class = device_serializer.DeviceSerializer
|
||||
|
||||
@@ -94,9 +95,11 @@ class DeviceViewSet(SoftDeleteMixin, viewsets.ModelViewSet, AdminFilterMixin):
|
||||
@transaction.atomic
|
||||
def my_devices(self, request):
|
||||
""" list of company devices """
|
||||
|
||||
organization = get_organization_by_user(request.user)
|
||||
# using admin filter mixin to get query
|
||||
devices = self.get_query(self.queryset)
|
||||
devices = self.get_query(self.get_queryset(
|
||||
visibility_by_org_scope=True
|
||||
) if organization.free_visibility_by_scope else self.get_queryset())
|
||||
|
||||
# paginate devices
|
||||
page = self.paginate_queryset(devices)
|
||||
|
||||
Reference in New Issue
Block a user