From 2b34885f9f061d86a618069a5917563a07fa6086 Mon Sep 17 00:00:00 2001 From: dzeranov Date: Thu, 4 Nov 2021 14:49:16 +0300 Subject: [PATCH] allowed_annotation_instrument in Task instead of *_mode --- cvat-core/src/session.js | 4 ++-- ...ion_mode.py => 0045_task_allowed_annotation_instrument.py} | 4 ++-- cvat/apps/engine/models.py | 2 +- cvat/apps/engine/serializers.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename cvat/apps/engine/migrations/{0045_task_allowed_annotation_mode.py => 0045_task_allowed_annotation_instrument.py} (76%) diff --git a/cvat-core/src/session.js b/cvat-core/src/session.js index ac464a1f053b..ff2712e3e8b6 100644 --- a/cvat-core/src/session.js +++ b/cvat-core/src/session.js @@ -955,7 +955,7 @@ use_cache: undefined, copy_data: undefined, dimension: undefined, - allowed_annotation_mode: undefined, + allowed_annotation_instrument: undefined, }; const updatedFields = new FieldUpdateTrigger({ @@ -1058,7 +1058,7 @@ * @throws {module:API.cvat.exceptions.ArgumentError} */ allowedAnnotationMode: { - get: () => data.allowed_annotation_mode, + get: () => data.allowed_annotation_instrument, }, /** * @name projectId diff --git a/cvat/apps/engine/migrations/0045_task_allowed_annotation_mode.py b/cvat/apps/engine/migrations/0045_task_allowed_annotation_instrument.py similarity index 76% rename from cvat/apps/engine/migrations/0045_task_allowed_annotation_mode.py rename to cvat/apps/engine/migrations/0045_task_allowed_annotation_instrument.py index f042600a8aa5..adce76616cf3 100644 --- a/cvat/apps/engine/migrations/0045_task_allowed_annotation_mode.py +++ b/cvat/apps/engine/migrations/0045_task_allowed_annotation_instrument.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.13 on 2021-10-25 15:28 +# Generated by Django 3.1.13 on 2021-11-04 10:56 from django.db import migrations, models @@ -12,7 +12,7 @@ class Migration(migrations.Migration): operations = [ migrations.AddField( model_name='task', - name='allowed_annotation_mode', + name='allowed_annotation_instrument', field=models.CharField(blank=True, default='', max_length=64), ), ] diff --git a/cvat/apps/engine/models.py b/cvat/apps/engine/models.py index 2b07875d0cd0..cd03bda9939f 100644 --- a/cvat/apps/engine/models.py +++ b/cvat/apps/engine/models.py @@ -237,7 +237,7 @@ class Task(models.Model): dimension = models.CharField(max_length=2, choices=DimensionType.choices(), default=DimensionType.DIM_2D) subset = models.CharField(max_length=64, blank=True, default="") is_exchange_notified = models.BooleanField(default=False) - allowed_annotation_mode = models.CharField(max_length=64, blank=True, default="") + allowed_annotation_instrument = models.CharField(max_length=64, blank=True, default="") # Extend default permission model class Meta: diff --git a/cvat/apps/engine/serializers.py b/cvat/apps/engine/serializers.py index 9bd214a24263..c493b672dcdb 100644 --- a/cvat/apps/engine/serializers.py +++ b/cvat/apps/engine/serializers.py @@ -391,7 +391,7 @@ class Meta: 'bug_tracker', 'created_date', 'updated_date', 'overlap', 'segment_size', 'status', 'labels', 'segments', 'data_chunk_size', 'data_compressed_chunk_type', 'data_original_chunk_type', 'size', 'image_quality', - 'data', 'dimension', 'subset', 'allowed_annotation_mode') + 'data', 'dimension', 'subset', 'allowed_annotation_instrument') read_only_fields = ('mode', 'created_date', 'updated_date', 'status', 'data_chunk_size', 'owner', 'assignee', 'data_compressed_chunk_type', 'data_original_chunk_type', 'size', 'image_quality', 'data') write_once_fields = ('overlap', 'segment_size', 'project_id')