From fcc96051085f59e49df184ff5b18b5b226bb7258 Mon Sep 17 00:00:00 2001 From: Boris Sekachev Date: Fri, 8 Sep 2023 13:12:47 +0300 Subject: [PATCH 1/4] Fixed task progress report for 3rdparty users --- cvat/apps/engine/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cvat/apps/engine/views.py b/cvat/apps/engine/views.py index b49977625b8e..b3a2634ab16e 100644 --- a/cvat/apps/engine/views.py +++ b/cvat/apps/engine/views.py @@ -1375,10 +1375,10 @@ def append_annotations_chunk(self, request, pk, file_id): }) @action(detail=True, methods=['GET'], serializer_class=RqStatusSerializer) def status(self, request, pk): - self.get_object() # force call of check_object_permissions() + task = self.get_object() response = self._get_rq_response( queue=settings.CVAT_QUEUES.IMPORT_DATA.value, - job_id=f"create:task.id{pk}-by-{request.user}" + job_id=f"create:task.id{pk}-by-{task.owner or ''}" ) serializer = RqStatusSerializer(data=response) From 6ed900105e8433b357d05b99dd11fbd4ccdde118 Mon Sep 17 00:00:00 2001 From: Boris Sekachev Date: Fri, 8 Sep 2023 13:17:14 +0300 Subject: [PATCH 2/4] Updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 353147e99de0..ddaa16139d02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - TDB ### Fixed -- TDB +- Incorrect task progress report for 3rdparty users () ### Security - TDB From 53062defab67272d2341d89ceb77c0aef2915934 Mon Sep 17 00:00:00 2001 From: Boris Sekachev Date: Fri, 8 Sep 2023 13:19:12 +0300 Subject: [PATCH 3/4] Removed user from key --- cvat/apps/engine/task.py | 2 +- cvat/apps/engine/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cvat/apps/engine/task.py b/cvat/apps/engine/task.py index bc71fcb1f6c7..6492188eafd3 100644 --- a/cvat/apps/engine/task.py +++ b/cvat/apps/engine/task.py @@ -44,7 +44,7 @@ def create(db_task, data, request): q.enqueue_call( func=_create_thread, args=(db_task.pk, data), - job_id=f"create:task.id{db_task.pk}-by-{request.user.username}", + job_id=f"create:task.id{db_task.pk}", meta=get_rq_job_meta(request=request, db_obj=db_task), ) diff --git a/cvat/apps/engine/views.py b/cvat/apps/engine/views.py index b3a2634ab16e..0f5dbfd8e0ad 100644 --- a/cvat/apps/engine/views.py +++ b/cvat/apps/engine/views.py @@ -1378,7 +1378,7 @@ def status(self, request, pk): task = self.get_object() response = self._get_rq_response( queue=settings.CVAT_QUEUES.IMPORT_DATA.value, - job_id=f"create:task.id{pk}-by-{task.owner or ''}" + job_id=f"create:task.id{pk}" ) serializer = RqStatusSerializer(data=response) From 4672679f1c9a31d6e525c6bb3b725d0d343b1947 Mon Sep 17 00:00:00 2001 From: Boris Sekachev Date: Fri, 8 Sep 2023 13:20:01 +0300 Subject: [PATCH 4/4] Aborted extra changes --- cvat/apps/engine/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cvat/apps/engine/views.py b/cvat/apps/engine/views.py index 0f5dbfd8e0ad..4305f1621e65 100644 --- a/cvat/apps/engine/views.py +++ b/cvat/apps/engine/views.py @@ -1375,7 +1375,7 @@ def append_annotations_chunk(self, request, pk, file_id): }) @action(detail=True, methods=['GET'], serializer_class=RqStatusSerializer) def status(self, request, pk): - task = self.get_object() + self.get_object() # force call of check_object_permissions() response = self._get_rq_response( queue=settings.CVAT_QUEUES.IMPORT_DATA.value, job_id=f"create:task.id{pk}"