Merge pull request #5184 from jaredevantabor/workflow-cancel

Show the Cancel icon (and hide the Delete icon) while workflow is run…

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"

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' ||
+                            ng-show="workflow.status == 'running' ||
-                                job_status.status=='pending' "
+                                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' ||
+                            ng-hide="workflow.status == 'running' ||
-                                job_status.status == 'pending' "
+                                workflow.status == 'pending' "
                             aw-tool-tip="{{'Delete'|translate}}"
                             data-original-title=""
                             title="">