Skip to content

Commit 09cfa50

Browse files
committed
Migrate api_slug missed before
1 parent aaf8d02 commit 09cfa50

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

ansible_base/rbac/migrations/0005_remote_permissions_data.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ def migrate_content_type(apps, schema_editor):
2727
cls = apps.get_model('dab_rbac', model_name)
2828
cls.objects.all().delete()
2929

30+
# DABPermission model had api_slug added in last migration
31+
# if records existed before this point, it needs to be filled in
32+
permission_cls = apps.get_model('dab_rbac', 'DABPermission')
33+
for permission in permission_cls.objects.all():
34+
permission.api_slug = f'{permission.new_content_type.service}.{permission.codename}'
35+
permission.save()
36+
3037

3138
class Migration(migrations.Migration):
3239

ansible_base/resource_registry/shared_types.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,6 @@ class TeamType(SharedResourceTypeSerializer):
7979
)
8080

8181

82-
class RoleDefinitionPermissionsSerializer(serializers.Serializer):
83-
permissions = serializers.SlugRelatedField(
84-
slug_field='api_slug',
85-
read_only=True,
86-
many=True,
87-
)
88-
89-
9082
class LenientPermissionSlugListField(serializers.ListField):
9183
child = serializers.CharField()
9284

@@ -100,7 +92,6 @@ def to_representation(self, value):
10092

10193
class RoleDefinitionType(SharedResourceTypeSerializer):
10294
RESOURCE_TYPE = "roledefinition"
103-
ADDITIONAL_DATA_SERIALIZER = RoleDefinitionPermissionsSerializer
10495
UNIQUE_FIELDS = ("name",)
10596

10697
name = serializers.CharField()

0 commit comments

Comments
 (0)