From 9744b897378a13f7f8e4106fb15263028e1f299e Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Fri, 13 Dec 2019 17:14:42 -0500 Subject: [PATCH] Use job details status to test status --- .../client/features/output/details.component.js | 2 +- .../client/features/output/details.partial.html | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/awx/ui/client/features/output/details.component.js b/awx/ui/client/features/output/details.component.js index de76ee669e..8f1c8ef361 100644 --- a/awx/ui/client/features/output/details.component.js +++ b/awx/ui/client/features/output/details.component.js @@ -39,7 +39,7 @@ function getStatusDetails (jobStatus) { value = choices[unmapped]; } - return { label, icon, value }; + return { unmapped, label, icon, value }; } function getStartDetails (started) { diff --git a/awx/ui/client/features/output/details.partial.html b/awx/ui/client/features/output/details.partial.html index 7264059b49..a067906886 100644 --- a/awx/ui/client/features/output/details.partial.html +++ b/awx/ui/client/features/output/details.partial.html @@ -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="">