From 5a30d3630ef383fa68ae2e7744508a1767c58997 Mon Sep 17 00:00:00 2001
From: jaredevantabor <jtabor@ansible.com>
Date: Fri, 3 Feb 2017 13:57:26 -0800
Subject: [PATCH 1/2] Show the Cancel icon (and hide the Delete icon) while
 workflow is running

---
 .../src/workflow-results/workflow-results.partial.html    | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 8c0bd7aae9..cdbcab3be2 100644
--- a/awx/ui/client/src/workflow-results/workflow-results.partial.html
+++ b/awx/ui/client/src/workflow-results/workflow-results.partial.html
@@ -37,8 +37,8 @@
                                 List-actionButton--delete"
                             data-placement="top"
                             ng-click="deleteJob()"
-                            ng-show="workflow_status.status == 'running' ||
-                                job_status.status=='pending' "
+                            ng-show="workflow.status == 'running' ||
+                                workflow.status=='pending' "
                             aw-tool-tip="{{'Cancel'|translate}}"
                             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="workflow.status == 'running' ||
+                                workflow.status == 'pending' "
                             aw-tool-tip="{{'Delete'|translate}}"
                             data-original-title=""
                             title="">

From 416615c08e4ea97d7cd6073afee5f69b93e1cd05 Mon Sep 17 00:00:00 2001
From: jaredevantabor <jtabor@ansible.com>
Date: Fri, 3 Feb 2017 14:23:41 -0800
Subject: [PATCH 2/2] fix for workflow badge tooltip

it wasn't being properly translated, which was screwing with the html
---
 awx/ui/client/src/lists/AllJobs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/src/lists/AllJobs.js b/awx/ui/client/src/lists/AllJobs.js
index 4f09a4f501..b611cb47d6 100644
--- a/awx/ui/client/src/lists/AllJobs.js
+++ b/awx/ui/client/src/lists/AllJobs.js
@@ -48,7 +48,7 @@ export default
                 badgePlacement: 'right',
                 badgeCustom: true,
                 badgeIcon: `<a href="{{ job.workflow_result_link }}"
-                    aw-tool-tip=i18n._("View workflow results")
+                    aw-tool-tip="{{'View workflow results'|translate}}"
                     data-placement="top"
                     data-original-title="" title="">
                     <i class="WorkflowBadge"