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

Merge pull request #5505 from jakemcdermott/fix-5485

Browse Source 
Use job details status to test status

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-12-16 23:45:45 +00:00 committed by GitHub
commit 85d185cc8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/features/output/details.component.js
View File

@ -39,7 +39,7 @@ function getStatusDetails (jobStatus) {
value = choices[unmapped];
}
return { label, icon, value };
return { unmapped, label, icon, value };
}
function getStartDetails (started) {

16
awx/ui/client/features/output/details.partial.html
View File

@ -12,9 +12,9 @@
class="List-actionButton List-actionButton--delete"
data-placement="top"
ng-click="vm.cancelJob()"
ng-show="vm.status.value === 'Pending' ||
vm.status.value === 'Waiting' ||
vm.status.value === 'Running'"
ng-show="vm.status.unmapped === 'pending' ||
vm.status.unmapped === 'waiting' ||
vm.status.unmapped === 'running'"
aw-tool-tip="{{:: vm.strings.get('tooltips.CANCEL') }}"
data-original-title=""
title="">
@ -27,11 +27,11 @@
data-placement="top"
ng-click="vm.deleteJob()"
ng-show="vm.canDelete && (
vm.status.value === 'New' ||
vm.status.value === 'Successful' ||
vm.status.value === 'Failed' ||
vm.status.value === 'Error' ||
vm.status.value === 'Canceled')"
vm.status.unmapped === 'new' ||
vm.status.unmapped === 'successful' ||
vm.status.unmapped === 'failed' ||
vm.status.unmapped === 'error' ||
vm.status.unmapped === 'canceled')"
aw-tool-tip="{{:: vm.strings.get('tooltips.DELETE') }}"
data-original-title=""
title="">