From 8b225e333b03bccbb38a2dd962d98d6c2f4bb8e9 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@ansible.com>
Date: Mon, 13 Apr 2015 14:48:39 -0400
Subject: [PATCH] Fix to delete/cancel jobs

---
 awx/ui/static/js/helpers/Jobs.js  | 3 +++
 awx/ui/static/js/lists/AllJobs.js | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/awx/ui/static/js/helpers/Jobs.js b/awx/ui/static/js/helpers/Jobs.js
index 55192f3b79..bbd2b3bff8 100644
--- a/awx/ui/static/js/helpers/Jobs.js
+++ b/awx/ui/static/js/helpers/Jobs.js
@@ -462,6 +462,9 @@ export default
                 else if (scope.queued_jobs) {
                     jobs = scope.queued_jobs;
                 }
+                else if (scope.all_jobs) {
+                    jobs = scope.all_jobs;
+                }
                 else if (scope.jobs) {
                     jobs = scope.jobs;
                 }
diff --git a/awx/ui/static/js/lists/AllJobs.js b/awx/ui/static/js/lists/AllJobs.js
index 8d64002093..550f8ce12b 100644
--- a/awx/ui/static/js/lists/AllJobs.js
+++ b/awx/ui/static/js/lists/AllJobs.js
@@ -101,14 +101,14 @@ export default
                 ngClick: 'deleteJob(all_job.id)',
                 awToolTip: 'Cancel the job',
                 dataPlacement: 'top',
-                ngShow: "all_job.status === 'running'"
+                ngShow: "all_job.status === 'running'|| all_job.status == 'waiting' || all_job.status == 'pending'"
             },
             "delete": {
                 mode: 'all',
                 ngClick: 'deleteJob(all_job.id)',
                 awToolTip: 'Delete the job',
                 dataPlacement: 'top',
-                ngShow: "all_job.status !== 'running'"
+                ngShow: "all_job.status !== 'running' && all_job.status !== 'waiting' && all_job.status !== 'pending'"
             },
             stdout: {
                 mode: 'all',