External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-16 20:30:46 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5184 from jaredevantabor/workflow-cancel

Browse Source 
Show the Cancel icon (and hide the Delete icon) while workflow is run…
This commit is contained in:
Jared Tabor 2017-02-06 09:47:27 -08:00 committed by GitHub
commit e9acdd79a3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/lists/AllJobs.js
View File

@ -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"

8
awx/ui/client/src/workflow-results/workflow-results.partial.html
View File

@ -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="">