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

Pre-delete bulk delete related, fix parallel request conflicts

Browse Source
This commit is contained in:
AlanCoding
2018-11-15 11:11:32 -05:00
parent 5e18eccd19
commit a9d88f728d
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/api/generics.py
View File

@@ -552,9 +552,8 @@ class SubListDestroyAPIView(DestroyAPIView, SubListAPIView):
def perform_list_destroy(self, instance_list): def perform_list_destroy(self, instance_list):
if self.check_sub_obj_permission: if self.check_sub_obj_permission:
# Check permissions for all before deleting, avoiding half-deleted lists
for instance in instance_list: for instance in instance_list:
if self.has_delete_permission(instance): if not self.has_delete_permission(instance):
raise PermissionDenied() raise PermissionDenied()
for instance in instance_list: for instance in instance_list:
self.perform_destroy(instance, check_permission=False) self.perform_destroy(instance, check_permission=False)

15
awx/api/views/__init__.py
View File

@@ -2056,6 +2056,14 @@ class InventorySourceHostsList(HostRelatedSearchMixin, SubListDestroyAPIView):
relationship = 'hosts' relationship = 'hosts'
check_sub_obj_permission = False check_sub_obj_permission = False
def perform_list_destroy(self, instance_list):
# Activity stream doesn't record disassociation here anyway
# no signals-related reason to not bulk-delete
Host.groups.through.objects.filter(
host__inventory_sources=self.get_parent_object()
).delete()
return super(InventorySourceHostsList, self).perform_list_destroy(instance_list)
class InventorySourceGroupsList(SubListDestroyAPIView): class InventorySourceGroupsList(SubListDestroyAPIView):
@@ -2065,6 +2073,13 @@ class InventorySourceGroupsList(SubListDestroyAPIView):
relationship = 'groups' relationship = 'groups'
check_sub_obj_permission = False check_sub_obj_permission = False
def perform_list_destroy(self, instance_list):
# Same arguments for bulk delete as with host list
Group.hosts.through.objects.filter(
group__inventory_sources=self.get_parent_object()
).delete()
return super(InventorySourceGroupsList, self).perform_list_destroy(instance_list)
class InventorySourceUpdatesList(SubListAPIView): class InventorySourceUpdatesList(SubListAPIView):