External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-27 05:45:02 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix server errors unattaching instance from group

Browse Source
This commit is contained in:
AlanCoding
2018-07-10 09:38:56 -04:00
parent 9c653cb603
commit 73f3837f62
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/views.py
View File

@@ -197,15 +197,17 @@ class InstanceGroupMembershipMixin(object):
def unattach_validate(self, request): def unattach_validate(self, request):
(sub_id, res) = super(InstanceGroupMembershipMixin, self).unattach_validate(request) (sub_id, res) = super(InstanceGroupMembershipMixin, self).unattach_validate(request)
if res: if res:
return res return (sub_id, res)
sub = get_object_or_400(self.model, pk=sub_id) sub = get_object_or_400(self.model, pk=sub_id)
attach_errors = self.is_valid_relation(None, sub) attach_errors = self.is_valid_relation(None, sub)
if attach_errors: if attach_errors:
return (sub_id, Response(attach_errors, status=status.HTTP_400_BAD_REQUEST)) return (sub_id, Response(attach_errors, status=status.HTTP_400_BAD_REQUEST))
return (sub_id, res)
def unattach(self, request, *args, **kwargs): def unattach(self, request, *args, **kwargs):
response = super(InstanceGroupMembershipMixin, self).unattach(request, *args, **kwargs) response = super(InstanceGroupMembershipMixin, self).unattach(request, *args, **kwargs)
if status.is_success(response.status_code): if status.is_success(response.status_code):
sub_id = request.data.get('id', None)
if self.parent_model is Instance: if self.parent_model is Instance:
ig_obj = get_object_or_400(self.model, pk=sub_id) ig_obj = get_object_or_400(self.model, pk=sub_id)
inst_name = self.get_parent_object().hostname inst_name = self.get_parent_object().hostname