From 73f3837f62b8f2e8e5d0c7b52c97642dc0de1dc1 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Tue, 10 Jul 2018 09:38:56 -0400 Subject: [PATCH] fix server errors unattaching instance from group --- awx/api/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/awx/api/views.py b/awx/api/views.py index f9d244ca93..72793f7c3f 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -197,15 +197,17 @@ class InstanceGroupMembershipMixin(object): def unattach_validate(self, request): (sub_id, res) = super(InstanceGroupMembershipMixin, self).unattach_validate(request) if res: - return res + return (sub_id, res) sub = get_object_or_400(self.model, pk=sub_id) attach_errors = self.is_valid_relation(None, sub) if attach_errors: return (sub_id, Response(attach_errors, status=status.HTTP_400_BAD_REQUEST)) + return (sub_id, res) def unattach(self, request, *args, **kwargs): response = super(InstanceGroupMembershipMixin, self).unattach(request, *args, **kwargs) if status.is_success(response.status_code): + sub_id = request.data.get('id', None) if self.parent_model is Instance: ig_obj = get_object_or_400(self.model, pk=sub_id) inst_name = self.get_parent_object().hostname