Skip to content

Commit d7c15fe

Browse files
author
Andrey Zhavoronkov
committed
fixed comments
1 parent e8af6a9 commit d7c15fe

File tree

5 files changed

+9
-15
lines changed

5 files changed

+9
-15
lines changed

cvat-core/src/server-proxy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
const { backendAPI } = config;
160160
let response = null;
161161
try {
162-
response = await Axios.get(`${backendAPI}/restrictions/user_agreements`, {
162+
response = await Axios.get(`${backendAPI}/restrictions/user-agreements`, {
163163
proxy: config.proxy,
164164
});
165165

cvat/apps/authentication/auth.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def is_job_annotator(db_user, db_job):
116116
db_task = db_job.segment.task
117117
# A job can be annotated by any user if the task's assignee is None.
118118
has_rights = (db_task.assignee is None and not settings.RESTRICTIONS['reduce_task_visibility']) or is_task_assignee(db_user, db_task)
119-
if db_job.assignee is not None and not settings.RESTRICTIONS['reduce_task_visibility']:
119+
if db_job.assignee is not None:
120120
has_rights |= (db_user == db_job.assignee)
121121

122122
return has_rights

cvat/apps/authentication/auth_basic.py

+3-10
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,13 @@
33
# SPDX-License-Identifier: MIT
44
from . import AUTH_ROLE
55
from django.conf import settings
6-
from importlib import import_module
7-
8-
def _import_role(role):
9-
assert isinstance(role, str)
10-
package, role_name = role.rsplit('.AUTH_ROLE.', 1)
11-
module = getattr(import_module(package), 'AUTH_ROLE')
12-
return getattr(module, role_name)
136

147
def create_user(sender, instance, created, **kwargs):
158
from django.contrib.auth.models import Group
169

1710
if instance.is_superuser and instance.is_staff:
1811
db_group = Group.objects.get(name=AUTH_ROLE.ADMIN)
1912
instance.groups.add(db_group)
20-
for group in settings.DJANGO_AUTH_DEFAULT_GROUPS:
21-
db_group = Group.objects.get(name=_import_role(group))
22-
instance.groups.add(db_group)
13+
for group_name in settings.DJANGO_AUTH_DEFAULT_GROUPS:
14+
db_group = Group.objects.get(name=getattr(AUTH_ROLE, group_name))
15+
instance.groups.add(db_group)

cvat/apps/restrictions/tests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def tearDown(self):
3737
settings.RESTRICTIONS['user_agreements'] = self.user_agreements
3838

3939
def _get_user_agreements(self):
40-
response = self.client.get('/api/v1/restrictions/user_agreements')
40+
response = self.client.get('/api/v1/restrictions/user-agreements')
4141
assert response.status_code == status.HTTP_200_OK
4242
for agreements in response.data:
4343
assert 'name' in agreements, agreements['name']

cvat/apps/restrictions/views.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@ def get_serializer(self, *args, **kwargs):
2727
method='get',
2828
operation_summary='Method provides user agreements that the user must accept to register',
2929
responses={'200': UserAgreementSerializer})
30-
@action(detail=False, methods=['GET'], serializer_class=UserAgreementSerializer)
30+
@action(detail=False, methods=['GET'], serializer_class=UserAgreementSerializer, url_path='user-agreements')
3131
def user_agreements(request):
3232
user_agreements = settings.RESTRICTIONS['user_agreements']
3333
serializer = UserAgreementSerializer(data=user_agreements, many=True)
3434
serializer.is_valid(raise_exception=True)
3535
return Response(data=serializer.data)
3636

3737
@staticmethod
38-
@action(detail=False, methods=['GET'], renderer_classes=(TemplateHTMLRenderer,))
38+
@action(detail=False, methods=['GET'], renderer_classes=(TemplateHTMLRenderer,),
39+
url_path='terms-of-use')
3940
def terms_of_use(request):
4041
return Response(template_name='restrictions/terms_of_use.html')

0 commit comments

Comments
 (0)