External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 05:31:22 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2296 from jaredevantabor/fix-719

Browse Source 
Displayeth thy Cancel button on the jobs list for a running system job
This commit is contained in:
Jared Tabor 2018-06-27 15:08:33 -07:00 committed by GitHub
commit 0ec95c8463
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,10 +74,13 @@
ng-show="job.summary_fields.user_capabilities.start">
</at-relaunch>
<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 === 'pending' ||
job.status === 'waiting' ||
job.status === 'running')">
job.status === 'running')) || ($root.user_is_superuser && job.type === 'system_job' &&
(job.status === 'pending' ||
job.status === 'waiting' ||
job.status === 'running'))">
</at-row-action>
<at-row-action icon="fa-trash" ng-click="vm.deleteJob(job)"
ng-show="job.summary_fields.user_capabilities.delete &&