diff --git a/apps/assets/api/account/account.py b/apps/assets/api/account/account.py index 714d3d5a2..36781aec1 100644 --- a/apps/assets/api/account/account.py +++ b/apps/assets/api/account/account.py @@ -1,13 +1,11 @@ +from django.shortcuts import get_object_or_404 from rest_framework.decorators import action from rest_framework.response import Response from rest_framework.generics import CreateAPIView, ListAPIView from orgs.mixins.api import OrgBulkModelViewSet -from rbac.permissions import RBACPermission from common.mixins import RecordViewLogMixin -from common.permissions import UserConfirmation -from authentication.const import ConfirmType from assets.models import Account from assets.filters import AccountFilterSet from assets.tasks import verify_accounts_connectivity @@ -32,7 +30,7 @@ class AccountViewSet(OrgBulkModelViewSet): @action(methods=['get'], detail=True, url_path='su-from-accounts') def su_from_accounts(self, request, *args, **kwargs): - account = super().get_object() + account = get_object_or_404(Account, pk=self.kwargs['pk']) accounts = account.get_su_from_accounts() serializer = serializers.AccountSerializer(accounts, many=True) return Response(data=serializer.data) diff --git a/apps/assets/serializers/account/account.py b/apps/assets/serializers/account/account.py index 69c4072e8..f8186d13e 100644 --- a/apps/assets/serializers/account/account.py +++ b/apps/assets/serializers/account/account.py @@ -60,7 +60,7 @@ class AccountSerializer(AccountSerializerCreateMixin, BaseAccountSerializer): ) su_from = ObjectRelatedField( required=False, queryset=Account.objects, allow_null=True, allow_empty=True, - label=_('Account'), attrs=('id', 'name', 'username') + label=_('Su from'), attrs=('id', 'name', 'username') ) class Meta(BaseAccountSerializer.Meta): diff --git a/apps/common/urls/api_urls.py b/apps/common/urls/api_urls.py index 01f164b00..452e47540 100644 --- a/apps/common/urls/api_urls.py +++ b/apps/common/urls/api_urls.py @@ -8,6 +8,5 @@ from .. import api app_name = 'common' urlpatterns = [ - path('resources/cache/', - api.ResourcesIDCacheApi.as_view(), name='resources-cache'), + path('resources/cache/', api.ResourcesIDCacheApi.as_view(), name='resources-cache'), ]