From 983eb43aec3c5e62cc78b1794e0080be289e3daa Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Tue, 14 Oct 2014 10:11:40 -0400 Subject: [PATCH] Add new to the list of statuses that will be canceled if a job's parent is removed --- awx/api/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index ff9b5b1128..fca1b2eb42 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -575,7 +575,7 @@ class ProjectDetail(RetrieveUpdateDestroyAPIView): can_delete = request.user.can_access(Project, 'delete', obj) if not can_delete: raise PermissionDenied("Cannot delete project") - for pu in obj.project_updates.filter(status__in=['pending', 'waiting', 'running']): + for pu in obj.project_updates.filter(status__in=['new', 'pending', 'waiting', 'running']): pu.cancel() return super(ProjectDetail, self).destroy(request, *args, **kwargs) @@ -1262,7 +1262,7 @@ class InventorySourceDetail(RetrieveUpdateAPIView): can_delete = request.user.can_access(InventorySource, 'delete', obj) if not can_delete: raise PermissionDenied("Cannot delete inventory source") - for pu in obj.inventory_updates.filter(status__in=['pending', 'waiting', 'running']): + for pu in obj.inventory_updates.filter(status__in=['new', 'pending', 'waiting', 'running']): pu.cancel() return super(InventorySourceDetail, self).destroy(request, *args, **kwargs) @@ -1376,7 +1376,7 @@ class JobTemplateDetail(RetrieveUpdateDestroyAPIView): can_delete = request.user.can_access(JobTemplate, 'delete', obj) if not can_delete: raise PermissionDenied("Cannot delete job template") - for pu in obj.jobs.filter(status__in=['pending', 'waiting', 'running']): + for pu in obj.jobs.filter(status__in=['new', 'pending', 'waiting', 'running']): pu.cancel() return super(JobTemplateDetail, self).destroy(request, *args, **kwargs)