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

Fix up some flake8 issues

Browse Source
This commit is contained in:
Matthew Jones
2016-07-14 12:40:37 -04:00
parent 00e55e3813
commit c852503163
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/api/views.py
View File

@@ -2189,9 +2189,6 @@ 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.")
if obj.jobs.filter(status__in=['new', 'pending', 'waiting', 'running']).exists():
return Response({"error": "Delete not allowed while there are jobs running"},
status=status.HTTP_405_METHOD_NOT_ALLOWED)
return super(JobTemplateDetail, self).destroy(request, *args, **kwargs) return super(JobTemplateDetail, self).destroy(request, *args, **kwargs)

2
awx/main/access.py
View File

@@ -761,7 +761,7 @@ class ProjectAccess(BaseAccess):
return self.user in obj.admin_role return self.user in obj.admin_role
def can_delete(self, obj): def can_delete(self, obj):
is_change_allowed = self.can_change(obj, None) is_change_allowed = self.can_change(obj, None)
if not is_change_allowed: if not is_change_allowed:
return False return False
active_jobs = [] active_jobs = []