Skip to content

Commit fcdb056

Browse files
authored
refactor: LEAP-1322: Remove Stale Feature Flag - ff_back_2070_inner_id_12052022_short (#6727)
1 parent 8d41917 commit fcdb056

File tree

3 files changed

+21
-25
lines changed

3 files changed

+21
-25
lines changed

label_studio/core/feature_flags/stale_feature_flags.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
'ff_front_dev_2431_delete_polygon_points_080622_short': True,
4141
'ff_front_dev_2290_draft_in_annotation_history_short': True,
4242
'ff_dev_2128_html_in_labels_150422_short': True,
43-
'ff_back_2070_inner_id_12052022_short': True,
4443
'ff_dev_2007_rework_choices_280322_short': True,
4544
'ff_front_dev_1495_avatar_mess_210122_short': True,
4645
'ff_front_1170_outliner_030222_short': True,

label_studio/data_manager/functions.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,17 @@ def get_all_columns(project, *_):
9090
}
9191
]
9292

93-
if flag_set('ff_back_2070_inner_id_12052022_short', user=project.organization.created_by):
94-
result['columns'] += [
95-
{
96-
'id': 'inner_id',
97-
'title': 'Inner ID',
98-
'type': 'Number',
99-
'help': 'Internal task ID starting from 1 for the current project',
100-
'target': 'tasks',
101-
'visibility_defaults': {'explore': False, 'labeling': False},
102-
'project_defined': False,
103-
}
104-
]
93+
result['columns'] += [
94+
{
95+
'id': 'inner_id',
96+
'title': 'Inner ID',
97+
'type': 'Number',
98+
'help': 'Internal task ID starting from 1 for the current project',
99+
'target': 'tasks',
100+
'visibility_defaults': {'explore': False, 'labeling': False},
101+
'project_defined': False,
102+
}
103+
]
105104

106105
if flag_set('fflag_fix_back_lsdv_4648_annotator_filter_29052023_short', user=project.organization.created_by):
107106
project_members = project.all_members.values_list('id', flat=True)

label_studio/tasks/models.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
from data_import.models import FileUpload
2929
from data_manager.managers import PreparedTaskManager, TaskManager
3030
from django.conf import settings
31-
from django.contrib.auth.models import AnonymousUser
3231
from django.db import OperationalError, models, transaction
3332
from django.db.models import CheckConstraint, JSONField, Q
3433
from django.db.models.signals import post_delete, post_save, pre_delete, pre_save
@@ -517,17 +516,16 @@ def ensure_unique_groundtruth(self, annotation_id):
517516
self.annotations.exclude(id=annotation_id).update(ground_truth=False)
518517

519518
def save(self, *args, update_fields=None, **kwargs):
520-
if flag_set('ff_back_2070_inner_id_12052022_short', AnonymousUser):
521-
if self.inner_id == 0:
522-
task = Task.objects.filter(project=self.project).order_by('-inner_id').first()
523-
max_inner_id = 1
524-
if task:
525-
max_inner_id = task.inner_id
526-
527-
# max_inner_id might be None in the old projects
528-
self.inner_id = None if max_inner_id is None else (max_inner_id + 1)
529-
if update_fields is not None:
530-
update_fields = {'inner_id'}.union(update_fields)
519+
if self.inner_id == 0:
520+
task = Task.objects.filter(project=self.project).order_by('-inner_id').first()
521+
max_inner_id = 1
522+
if task:
523+
max_inner_id = task.inner_id
524+
525+
# max_inner_id might be None in the old projects
526+
self.inner_id = None if max_inner_id is None else (max_inner_id + 1)
527+
if update_fields is not None:
528+
update_fields = {'inner_id'}.union(update_fields)
531529

532530
super().save(*args, update_fields=update_fields, **kwargs)
533531

0 commit comments

Comments
 (0)