From 432e379878af4bc5acf3d2e65a737b4d443fa4f2 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Sun, 27 Oct 2013 15:56:38 -0400 Subject: [PATCH] Disable automatic deletion of a group when it has no more parents to support new UI inventory tree changes. --- awx/main/tests/inventory.py | 6 +++--- awx/main/views.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/main/tests/inventory.py b/awx/main/tests/inventory.py index ca29a11d88..bf67b145f6 100644 --- a/awx/main/tests/inventory.py +++ b/awx/main/tests/inventory.py @@ -673,7 +673,7 @@ class InventoryTest(BaseTest): data = {'id': removed_group.pk, 'disassociate': 1} self.post(parent_children_url, data, expect=204, auth=self.get_super_credentials()) removed_group = Group.objects.get(pk=result['id']) - self.assertFalse(removed_group.active) + #self.assertFalse(removed_group.active) # FIXME: Disabled for now because automatically deleting group with no parents is also disabled. # Removing a group from a hierarchy should migrate its children to the # parent. The group itself will be deleted (marked inactive), and all @@ -686,9 +686,9 @@ class InventoryTest(BaseTest): 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.active) # FIXME: Disabled for now.... self.assertFalse(gx3 in gx2.children.all()) - self.assertTrue(gx4 in gx2.children.all()) + #self.assertTrue(gx4 in gx2.children.all()) # Try with invalid hostnames and invalid IPs. hosts = reverse('main:host_list') diff --git a/awx/main/views.py b/awx/main/views.py index 5c31438883..6f903bcfc7 100644 --- a/awx/main/views.py +++ b/awx/main/views.py @@ -515,7 +515,7 @@ class GroupChildrenList(SubListCreateAPIView): parent_model = Group relationship = 'children' - def unattach(self, request, *args, **kwargs): + def _unattach(self, request, *args, **kwargs): # FIXME: Disabled for now for UI support. ''' Special case for disassociating a child group from the parent. If the child group has no more parents, then automatically mark it inactive.