External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02: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
parent 77b8f345ae 9744b89737
commit 85d185cc8b
2 changed files with 9 additions and 9 deletions
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]; value = choices[unmapped];
} }
return { label, icon, value }; return { unmapped, label, icon, value };
} }
function getStartDetails (started) { function getStartDetails (started) {

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

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