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

Fix to delete/cancel jobs

Browse Source
This commit is contained in:
Jared Tabor
2015-04-13 14:48:39 -04:00
parent 9cffbd63c2
commit 8b225e333b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/static/js/helpers/Jobs.js
View File

@@ -462,6 +462,9 @@ export default
else if (scope.queued_jobs) { else if (scope.queued_jobs) {
jobs = scope.queued_jobs; jobs = scope.queued_jobs;
} }
else if (scope.all_jobs) {
jobs = scope.all_jobs;
}
else if (scope.jobs) { else if (scope.jobs) {
jobs = scope.jobs; jobs = scope.jobs;
} }

4
awx/ui/static/js/lists/AllJobs.js
View File

@@ -101,14 +101,14 @@ export default
ngClick: 'deleteJob(all_job.id)', ngClick: 'deleteJob(all_job.id)',
awToolTip: 'Cancel the job', awToolTip: 'Cancel the job',
dataPlacement: 'top', dataPlacement: 'top',
ngShow: "all_job.status === 'running'" ngShow: "all_job.status === 'running'|| all_job.status == 'waiting' || all_job.status == 'pending'"
}, },
"delete": { "delete": {
mode: 'all', mode: 'all',
ngClick: 'deleteJob(all_job.id)', ngClick: 'deleteJob(all_job.id)',
awToolTip: 'Delete the job', awToolTip: 'Delete the job',
dataPlacement: 'top', dataPlacement: 'top',
ngShow: "all_job.status !== 'running'" ngShow: "all_job.status !== 'running' && all_job.status !== 'waiting' && all_job.status !== 'pending'"
}, },
stdout: { stdout: {
mode: 'all', mode: 'all',