diff --git a/awx/ui/static/js/controllers/JobDetail.js b/awx/ui/static/js/controllers/JobDetail.js index c7f2f06951..16503ed795 100644 --- a/awx/ui/static/js/controllers/JobDetail.js +++ b/awx/ui/static/js/controllers/JobDetail.js @@ -13,7 +13,7 @@ export function JobDetailController ($location, $rootScope, $scope, $compile, $routeParams, $log, ClearScope, Breadcrumbs, LoadBreadCrumbs, GetBasePath, Wait, Rest, ProcessErrors, SelectPlay, SelectTask, Socket, GetElapsed, DrawGraph, LoadHostSummary, ReloadHostSummaryList, JobIsFinished, SetTaskStyles, DigestEvent, - UpdateDOM, EventViewer, DeleteJob, PlaybookRun, HostEventsViewer, LoadPlays, LoadTasks, LoadHosts, HostsEdit, ParseVariableString) { + UpdateDOM, EventViewer, DeleteJob, PlaybookRun, HostEventsViewer, LoadPlays, LoadTasks, LoadHosts, HostsEdit, ParseVariableString, GetChoices) { ClearScope(); @@ -86,6 +86,14 @@ export function JobDetailController ($location, $rootScope, $scope, $compile, $r { value: 'check', label: 'Check' } ]; + GetChoices({ + scope: scope, + url: GetBasePath('unified_jobs'), + field: 'status', + variable: 'status_choices', + // callback: 'choicesReady' + }); + scope.eventsHelpText = "
Successful
\n" + "Changed
\n" + "Unreachable
\n" + @@ -680,6 +688,13 @@ export function JobDetailController ($location, $rootScope, $scope, $compile, $r else { scope.job_status.elapsed = '00:00:00'; } + scope.status_choices.every(function(status) { + if (status.value === scope.job.status) { + scope.job_status.status_label = status.label; + return false; + } + return true; + }); //scope.setSearchAll('host'); scope.$emit('LoadPlays', data.related.job_events); scope.$emit('GetCreatedByNames', data.related.created_by); @@ -1305,5 +1320,5 @@ export function JobDetailController ($location, $rootScope, $scope, $compile, $r JobDetailController.$inject = [ '$location', '$rootScope', '$scope', '$compile', '$routeParams', '$log', 'ClearScope', 'Breadcrumbs', 'LoadBreadCrumbs', 'GetBasePath', 'Wait', 'Rest', 'ProcessErrors', 'SelectPlay', 'SelectTask', 'Socket', 'GetElapsed', 'DrawGraph', 'LoadHostSummary', 'ReloadHostSummaryList', 'JobIsFinished', 'SetTaskStyles', 'DigestEvent', 'UpdateDOM', 'EventViewer', 'DeleteJob', 'PlaybookRun', 'HostEventsViewer', 'LoadPlays', 'LoadTasks', - 'LoadHosts', 'HostsEdit', 'ParseVariableString' + 'LoadHosts', 'HostsEdit', 'ParseVariableString', 'GetChoices' ]; diff --git a/awx/ui/static/js/lists/AllJobs.js b/awx/ui/static/js/lists/AllJobs.js index 550f8ce12b..fe194baa7d 100644 --- a/awx/ui/static/js/lists/AllJobs.js +++ b/awx/ui/static/js/lists/AllJobs.js @@ -35,7 +35,7 @@ export default awTipPlacement: "top", dataTitle: "{{ all_job.status_popover_title }}", icon: 'icon-job-{{ all_job.status }}', - alt_text: "{{all_job.status | capitalize}}", + alt_text: "{{all_job.status_label}}", iconOnly: true, ngClick:"viewJobLog(all_job.id)", searchable: true, diff --git a/awx/ui/static/partials/job_detail.html b/awx/ui/static/partials/job_detail.html index ac073e29aa..e1e4b2fdf3 100644 --- a/awx/ui/static/partials/job_detail.html +++ b/awx/ui/static/partials/job_detail.html @@ -15,7 +15,7 @@