Skip to content

allowed_annotation_instrument in Task instead of *_mode #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vkomodey merged 1 commit into from
Nov 4, 2021
Merged

allowed_annotation_instrument in Task instead of *_mode #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cvat-core/src/session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,7 @@
use_cache: undefined,
copy_data: undefined,
dimension: undefined,
allowed_annotation_mode: undefined,
allowed_annotation_instrument: undefined,
};

const updatedFields = new FieldUpdateTrigger({
Expand Down Expand Up @@ -1058,7 +1058,7 @@
* @throws {module:API.cvat.exceptions.ArgumentError}
*/
allowedAnnotationMode: {
get: () => data.allowed_annotation_mode,
get: () => data.allowed_annotation_instrument,
},
/**
* @name projectId
Expand Down
4 changes: 2 additions & 2 deletions ...ions/0045_task_allowed_annotation_mode.py → ...045_task_allowed_annotation_instrument.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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),
),
]
2 changes: 1 addition & 1 deletion cvat/apps/engine/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion cvat/apps/engine/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down