Skip to content

Commit 0b05d87

Browse files
committed
More code cleanup
1 parent 5ba0fd3 commit 0b05d87

File tree

1 file changed

+8
-20
lines changed

1 file changed

+8
-20
lines changed

ansible_base/rbac/api/views.py

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -120,38 +120,26 @@ def _error_if_managed(self, instance):
120120
if instance.managed is True:
121121
raise ValidationError(_('Role is managed by the system'))
122122

123-
def create(self, request, *args, **kwargs):
124-
"""Create a new RoleDefinition with delayed reverse-sync."""
123+
def perform_create(self, serializer):
125124
from ansible_base.resource_registry.signals.handlers import no_reverse_sync
126125

127126
with no_reverse_sync():
128-
response = super().create(request, *args, **kwargs)
127+
super().perform_create(serializer)
129128

130129
# Manually sync after permissions are fully saved
131-
instance = self.get_queryset().get(pk=response.data['id'])
132-
maybe_reverse_sync_role_definition(instance, "create")
133-
134-
return response
130+
maybe_reverse_sync_role_definition(serializer.instance, "create")
135131

136-
def update(self, request, *args, **kwargs):
137-
"""Update a RoleDefinition with delayed reverse-sync."""
132+
def perform_update(self, serializer):
138133
from ansible_base.resource_registry.signals.handlers import no_reverse_sync
139134

140-
instance = self.get_object()
141-
self._error_if_managed(instance)
135+
self._error_if_managed(serializer.instance)
142136

143137
with no_reverse_sync():
144-
response = super().update(request, *args, **kwargs)
138+
super().perform_update(serializer)
145139

146140
# Manually sync after permissions are fully saved
147-
instance.refresh_from_db()
148-
maybe_reverse_sync_role_definition(instance, "update")
149-
150-
return response
151-
152-
def perform_update(self, serializer):
153-
self._error_if_managed(serializer.instance)
154-
return super().perform_update(serializer)
141+
serializer.instance.refresh_from_db()
142+
maybe_reverse_sync_role_definition(serializer.instance, "update")
155143

156144
def perform_destroy(self, instance):
157145
self._error_if_managed(instance)

0 commit comments

Comments
 (0)