External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-13 23:17:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

Obtaining job status from API instead of capitalizing

Browse Source 
The jobs page and the job detail page now use the API value to display job status
This commit is contained in:
Jared Tabor
2015-04-14 15:21:28 -04:00
parent e6f376ebc2
commit ed0f6a7918
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
awx/ui/static/js/controllers/JobDetail.js
View File

@@ -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 = "<p><i class=\"fa fa-circle successful-hosts-color\"></i> Successful</p>\n" +
"<p><i class=\"fa fa-circle changed-hosts-color\"></i> Changed</p>\n" +
"<p><i class=\"fa fa-circle unreachable-hosts-color\"></i> Unreachable</p>\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'
];

2
awx/ui/static/js/lists/AllJobs.js
View File

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

2
awx/ui/static/partials/job_detail.html
View File

@@ -15,7 +15,7 @@
<div class="job_well">
<div class="row">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-2">Status</label>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 job_status"><i class="fa icon-job-{{ job_status.status }}"></i> {{ job_status.status }}</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 job_status"><i class="fa icon-job-{{ job_status.status }}"></i> {{ job_status.status_label }}</div>
<div class="col-lg-4 text-right">
<a href="" id="play-help" aw-pop-over="Live event processing is now paused. Click here to resume." id="play-button-help" data-placement="left" ng-show="pauseLiveEvents" ><i class="fa fa-question"></i></a>