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

Fix for AC-310. Change how we unattach a group from a parent group when it has no other parents, mark it inactive instead of just removing the relationship.

Browse Source
This commit is contained in:
Chris Church
2013-08-04 22:38:36 -04:00
parent 057e7bad59
commit 49beca2b97
2 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
awx/main/tests/inventory.py
View File

@@ -478,11 +478,15 @@ class InventoryTest(BaseTest):
# just some more groups for kicks # just some more groups for kicks
inva = Inventory.objects.get(pk=self.inventory_a.pk) inva = Inventory.objects.get(pk=self.inventory_a.pk)
Group.objects.create(name='group-X1', inventory=inva) gx1 = Group.objects.create(name='group-X1', inventory=inva)
Group.objects.create(name='group-X2', inventory=inva) gx2 = Group.objects.create(name='group-X2', inventory=inva)
Group.objects.create(name='group-X3', inventory=inva) gx2.parents.add(gx1)
Group.objects.create(name='group-X4', inventory=inva) gx3 = Group.objects.create(name='group-X3', inventory=inva)
Group.objects.create(name='group-X5', inventory=inva) gx3.parents.add(gx2)
gx4 = Group.objects.create(name='group-X4', inventory=inva)
gx4.parents.add(gx3)
gx5 = Group.objects.create(name='group-X5', inventory=inva)
gx5.parents.add(gx4)
Permission.objects.create( Permission.objects.create(
inventory = inva, inventory = inva,
@@ -577,6 +581,21 @@ class InventoryTest(BaseTest):
removed_group = Group.objects.get(pk=result['id']) removed_group = Group.objects.get(pk=result['id'])
self.assertFalse(removed_group.active) self.assertFalse(removed_group.active)
# Removing a group from a hierarchy should migrate its children to the
# parent. The group itself will be deleted (marked inactive), and all
# relationships removed.
url = reverse('main:group_children_list', args=(gx2.pk,))
data = {
'id': gx3.pk,
'disassociate': 1,
}
with self.current_user(self.super_django_user):
response = self.post(url, data, expect=204)
gx3 = Group.objects.get(pk=gx3.pk)
self.assertFalse(gx3.active)
self.assertFalse(gx3 in gx2.children.all())
self.assertTrue(gx4 in gx2.children.all())
######################################################### #########################################################
# FIXME: TAGS # FIXME: TAGS

25
awx/main/views.py
View File

@@ -420,13 +420,26 @@ class GroupChildrenList(SubListCreateAPIView):
Special case for disassociating a child group from the parent. If the Special case for disassociating a child group from the parent. If the
child group has no more parents, then automatically mark it inactive. child group has no more parents, then automatically mark it inactive.
''' '''
response = super(GroupChildrenList, self).unattach(request, *args, **kwargs) sub_id = request.DATA.get('id', None)
if response.status_code != status.HTTP_204_NO_CONTENT: if not sub_id:
return response data = dict(msg='"id" is required to disassociate')
sub = self.model.objects.get(pk=request.DATA.get('id', None)) return Response(data, status=status.HTTP_400_BAD_REQUEST)
if sub.parents.filter(active=True).count() == 0:
parent = self.get_parent_object()
parent_key = getattr(self, 'parent_key', None)
relationship = getattr(parent, self.relationship)
sub = get_object_or_400(self.model, pk=sub_id)
if not request.user.can_access(self.parent_model, 'unattach', parent,
sub, self.relationship):
raise PermissionDenied()
if sub.parents.filter(active=True).exclude(pk=parent.pk).count() == 0:
sub.mark_inactive() sub.mark_inactive()
return response else:
relationship.remove(sub)
return Response(status=status.HTTP_204_NO_CONTENT)
class GroupHostsList(SubListCreateAPIView): class GroupHostsList(SubListCreateAPIView):
''' the list of hosts directly below a group ''' ''' the list of hosts directly below a group '''