External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Add new to the list of statuses that will be canceled if a job's parent

Browse Source 
is removed
This commit is contained in:
Matthew Jones
2014-10-14 10:11:40 -04:00
parent 8d0cdd66e0
commit 983eb43aec
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/views.py
View File

@@ -575,7 +575,7 @@ class ProjectDetail(RetrieveUpdateDestroyAPIView):
can_delete = request.user.can_access(Project, 'delete', obj) can_delete = request.user.can_access(Project, 'delete', obj)
if not can_delete: if not can_delete:
raise PermissionDenied("Cannot delete project") 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() pu.cancel()
return super(ProjectDetail, self).destroy(request, *args, **kwargs) return super(ProjectDetail, self).destroy(request, *args, **kwargs)
@@ -1262,7 +1262,7 @@ class InventorySourceDetail(RetrieveUpdateAPIView):
can_delete = request.user.can_access(InventorySource, 'delete', obj) can_delete = request.user.can_access(InventorySource, 'delete', obj)
if not can_delete: if not can_delete:
raise PermissionDenied("Cannot delete inventory source") 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() pu.cancel()
return super(InventorySourceDetail, self).destroy(request, *args, **kwargs) return super(InventorySourceDetail, self).destroy(request, *args, **kwargs)
@@ -1376,7 +1376,7 @@ class JobTemplateDetail(RetrieveUpdateDestroyAPIView):
can_delete = request.user.can_access(JobTemplate, 'delete', obj) can_delete = request.user.can_access(JobTemplate, 'delete', obj)
if not can_delete: if not can_delete:
raise PermissionDenied("Cannot delete job template") 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() pu.cancel()
return super(JobTemplateDetail, self).destroy(request, *args, **kwargs) return super(JobTemplateDetail, self).destroy(request, *args, **kwargs)