diff --git a/.gitmodules b/.gitmodules index 61610061386a..ae36fe056e5f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "site/themes/docsy"] path = site/themes/docsy - url = git@github.com:google/docsy.git + url = https://github.com/google/docsy diff --git a/cvat/apps/iam/permissions.py b/cvat/apps/iam/permissions.py index d8b0a434b4f9..b4e802378f96 100644 --- a/cvat/apps/iam/permissions.py +++ b/cvat/apps/iam/permissions.py @@ -149,8 +149,7 @@ def get_resource(self): def check_access(self) -> PermissionResult: with make_requests_session() as session: response = session.post(self.url, json=self.payload) - output = response.json() - output = output['result'] + output = response.json()['result'] allow = False reasons = [] diff --git a/cvat/apps/organizations/serializers.py b/cvat/apps/organizations/serializers.py index 3a46b1576050..966c28c5fa1d 100644 --- a/cvat/apps/organizations/serializers.py +++ b/cvat/apps/organizations/serializers.py @@ -14,7 +14,7 @@ from rest_framework import serializers from cvat.apps.engine.serializers import BasicUserSerializer from cvat.apps.iam.utils import get_dummy_user -from .models import * +from .models import Invitation, Membership, Organization class OrganizationReadSerializer(serializers.ModelSerializer): owner = BasicUserSerializer(allow_null=True) diff --git a/cvat/apps/organizations/urls.py b/cvat/apps/organizations/urls.py index 00f38b20aaf3..068f72b0968d 100644 --- a/cvat/apps/organizations/urls.py +++ b/cvat/apps/organizations/urls.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT from rest_framework.routers import DefaultRouter -from .views import * +from .views import InvitationViewSet, MembershipViewSet, OrganizationViewSet router = DefaultRouter(trailing_slash=False) router.register('organizations', OrganizationViewSet) diff --git a/cvat/apps/organizations/views.py b/cvat/apps/organizations/views.py index 2b6e4e67e7d8..41be1fdf9d27 100644 --- a/cvat/apps/organizations/views.py +++ b/cvat/apps/organizations/views.py @@ -24,7 +24,11 @@ from .models import Invitation, Membership, Organization import traceback -from .serializers import * +from .serializers import ( + InvitationReadSerializer, InvitationWriteSerializer, + MembershipReadSerializer, MembershipWriteSerializer, + OrganizationReadSerializer, OrganizationWriteSerializer, + AcceptInvitationReadSerializer) @extend_schema(tags=['organizations']) @extend_schema_view(