From c67989bc90de9f3d296dbb247ce399d1e419fa3b Mon Sep 17 00:00:00 2001
From: Chris Meyers <chris.meyers.fsu@gmail.com>
Date: Thu, 12 Jan 2017 11:32:56 -0500
Subject: [PATCH] correctly cancel/delete on job details

related to #4620

* Changed cancel prompt buttons from "Cancel" "Cancel" to "Cancel"
"Proceed", talk about some confusing shit.
* Removed copy and pasted code that would call a delete upon canceling a
job
* Don't expect job_status to be an object in the view, just
`job_status`, not `job_status.status`
---
 .../src/job-results/job-results.partial.html     | 10 +++++-----
 .../src/job-results/job-results.service.js       | 16 +---------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/awx/ui/client/src/job-results/job-results.partial.html b/awx/ui/client/src/job-results/job-results.partial.html
index 6fe760b55e..4788a036c4 100644
--- a/awx/ui/client/src/job-results/job-results.partial.html
+++ b/awx/ui/client/src/job-results/job-results.partial.html
@@ -36,9 +36,9 @@
                         <button class="List-actionButton
                                 List-actionButton--delete"
                             data-placement="top"
-                            ng-click="deleteJob()"
-                            ng-show="job_status.status == 'running' ||
-                                job_status.status=='pending' "
+                            ng-click="cancelJob()"
+                            ng-show="job_status == 'running' ||
+                                job_status=='pending' "
                             aw-tool-tip="Cancel"
                             data-original-title="" title="">
                             <i class="fa fa-minus-circle"></i>
@@ -49,8 +49,8 @@
                                 List-actionButton--delete"
                             data-placement="top"
                             ng-click="deleteJob()"
-                            ng-hide="job_status.status == 'running' ||
-                                job_status.status == 'pending' "
+                            ng-hide="job_status == 'running' ||
+                                job_status == 'pending' "
                             aw-tool-tip="Delete"
                             data-original-title=""
                             title="">
diff --git a/awx/ui/client/src/job-results/job-results.service.js b/awx/ui/client/src/job-results/job-results.service.js
index 02f4a31548..6fbeefde13 100644
--- a/awx/ui/client/src/job-results/job-results.service.js
+++ b/awx/ui/client/src/job-results/job-results.service.js
@@ -171,22 +171,8 @@ function ($q, Prompt, $filter, Wait, Rest, $state, ProcessErrors, InitiatePlaybo
                                 });
                             }
                         });
-                    Rest.destroy()
-                        .success(function() {
-                            Wait('stop');
-                            $('#prompt-modal').modal('hide');
-                        })
-                        .error(function(obj, status) {
-                            Wait('stop');
-                            $('#prompt-modal').modal('hide');
-                            ProcessErrors(null, obj, status, null, {
-                                hdr: 'Error!',
-                                msg: `Could not cancel job.
-                                    Returned status: ${status}`
-                            });
-                        });
                 },
-                actionText: 'CANCEL'
+                actionText: 'PROCEED'
             });
         },
         relaunchJob: function(scope) {