External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-11 13:09:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

Cancelable job status' should be pending, waiting or running

Browse Source
This commit is contained in:
mabashian
2018-04-12 09:30:04 -04:00
parent fab3f3d592
commit f35bc4b40a
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/features/jobs/jobsList.view.html
View File

@@ -73,15 +73,13 @@
</at-relaunch> </at-relaunch>
<at-row-action icon="fa-minus-circle" ng-click="vm.cancelJob(job)" <at-row-action icon="fa-minus-circle" ng-click="vm.cancelJob(job)"
ng-show="job.summary_fields.user_capabilities.start && ng-show="job.summary_fields.user_capabilities.start &&
(job.status === 'new' || (job.status === 'pending' ||
job.status === 'pending' ||
job.status === 'waiting' || job.status === 'waiting' ||
job.status === 'running')"> job.status === 'running')">
</at-row-action> </at-row-action>
<at-row-action icon="fa-trash" ng-click="vm.deleteJob(job)" <at-row-action icon="fa-trash" ng-click="vm.deleteJob(job)"
ng-show="job.summary_fields.user_capabilities.delete && ng-show="job.summary_fields.user_capabilities.delete &&
!(job.status === 'new' || !(job.status === 'pending' ||
job.status === 'pending' ||
job.status === 'waiting' || job.status === 'waiting' ||
job.status === 'running')"> job.status === 'running')">
</at-row-action> </at-row-action>