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

Merge pull request #4286 from AlanCoding/destroyer_of_nodes

Browse Source 
Switch job destroy WF check to OneToOne patterns
This commit is contained in:
Alan Rominger
2016-12-05 11:15:47 -05:00
committed by GitHub
parent f0e7385f54 101b50c888
commit 8e76da89f2
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
awx/api/views.py
View File

@@ -1159,8 +1159,11 @@ class ProjectUpdateDetail(RetrieveDestroyAPIView):
def destroy(self, request, *args, **kwargs): def destroy(self, request, *args, **kwargs):
obj = self.get_object() obj = self.get_object()
if obj.unified_job_node.filter(workflow_job__status__in=ACTIVE_STATES).exists(): try:
raise PermissionDenied(detail=_('Cannot delete job resource when associated workflow job is running.')) if obj.unified_job_node.workflow_job.status in ACTIVE_STATES:
raise PermissionDenied(detail=_('Cannot delete job resource when associated workflow job is running.'))
except ProjectUpdate.unified_job_node.RelatedObjectDoesNotExist:
pass
return super(ProjectUpdateDetail, self).destroy(request, *args, **kwargs) return super(ProjectUpdateDetail, self).destroy(request, *args, **kwargs)
@@ -2239,8 +2242,11 @@ class InventoryUpdateDetail(RetrieveDestroyAPIView):
def destroy(self, request, *args, **kwargs): def destroy(self, request, *args, **kwargs):
obj = self.get_object() obj = self.get_object()
if obj.unified_job_node.filter(workflow_job__status__in=ACTIVE_STATES).exists(): try:
raise PermissionDenied(detail=_('Cannot delete job resource when associated workflow job is running.')) if obj.unified_job_node.workflow_job.status in ACTIVE_STATES:
raise PermissionDenied(detail=_('Cannot delete job resource when associated workflow job is running.'))
except InventoryUpdate.unified_job_node.RelatedObjectDoesNotExist:
pass
return super(InventoryUpdateDetail, self).destroy(request, *args, **kwargs) return super(InventoryUpdateDetail, self).destroy(request, *args, **kwargs)
@@ -3205,8 +3211,11 @@ class JobDetail(RetrieveUpdateDestroyAPIView):
def destroy(self, request, *args, **kwargs): def destroy(self, request, *args, **kwargs):
obj = self.get_object() obj = self.get_object()
if obj.unified_job_node.filter(workflow_job__status__in=ACTIVE_STATES).exists(): try:
raise PermissionDenied(detail=_('Cannot delete job resource when associated workflow job is running.')) if obj.unified_job_node.workflow_job.status in ACTIVE_STATES:
raise PermissionDenied(detail=_('Cannot delete job resource when associated workflow job is running.'))
except Job.unified_job_node.RelatedObjectDoesNotExist:
pass
return super(JobDetail, self).destroy(request, *args, **kwargs) return super(JobDetail, self).destroy(request, *args, **kwargs)