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

Disable automatic deletion of a group when it has no more parents to support new UI inventory tree changes.

Browse Source
This commit is contained in:
Chris Church
2013-10-27 15:56:38 -04:00
parent 0e5b358cb6
commit 432e379878
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -673,7 +673,7 @@ class InventoryTest(BaseTest):
data = {'id': removed_group.pk, 'disassociate': 1} data = {'id': removed_group.pk, 'disassociate': 1}
self.post(parent_children_url, data, expect=204, auth=self.get_super_credentials()) self.post(parent_children_url, data, expect=204, auth=self.get_super_credentials())
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) # 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 # Removing a group from a hierarchy should migrate its children to the
# parent. The group itself will be deleted (marked inactive), and all # 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): with self.current_user(self.super_django_user):
response = self.post(url, data, expect=204) response = self.post(url, data, expect=204)
gx3 = Group.objects.get(pk=gx3.pk) 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.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. # Try with invalid hostnames and invalid IPs.
hosts = reverse('main:host_list') hosts = reverse('main:host_list')

2
awx/main/views.py
View File

@@ -515,7 +515,7 @@ class GroupChildrenList(SubListCreateAPIView):
parent_model = Group parent_model = Group
relationship = 'children' 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 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.