From db5077973114227a4e81e1ebeacdbe4de6844a06 Mon Sep 17 00:00:00 2001
From: jaredevantabor <jtabor@ansible.com>
Date: Tue, 7 Feb 2017 16:04:05 -0800
Subject: [PATCH] fixing cancel function for workflow results

---
 .../workflow-results/workflow-results.partial.html |  2 +-
 .../workflow-results/workflow-results.service.js   | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/awx/ui/client/src/workflow-results/workflow-results.partial.html b/awx/ui/client/src/workflow-results/workflow-results.partial.html
index cdbcab3be2..5d0bbf87f9 100644
--- a/awx/ui/client/src/workflow-results/workflow-results.partial.html
+++ b/awx/ui/client/src/workflow-results/workflow-results.partial.html
@@ -36,7 +36,7 @@
                         <button class="List-actionButton
                                 List-actionButton--delete"
                             data-placement="top"
-                            ng-click="deleteJob()"
+                            ng-click="cancelJob()"
                             ng-show="workflow.status == 'running' ||
                                 workflow.status=='pending' "
                             aw-tool-tip="{{'Cancel'|translate}}"
diff --git a/awx/ui/client/src/workflow-results/workflow-results.service.js b/awx/ui/client/src/workflow-results/workflow-results.service.js
index 3a9fda703a..abe39b14e6 100644
--- a/awx/ui/client/src/workflow-results/workflow-results.service.js
+++ b/awx/ui/client/src/workflow-results/workflow-results.service.js
@@ -106,20 +106,6 @@ export default ['$q', 'Prompt', '$filter', 'Wait', 'Rest', '$state', 'ProcessErr
                                 });
                             }
                         });
-                    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 workflow.
-                                    Returned status: ${status}`
-                            });
-                        });
                 },
                 actionText: 'CANCEL'
             });