shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

fixed on reload job status'

Browse Source
This commit is contained in:
John Mitchell 2016-12-14 15:03:20 -05:00
parent d8f3356bae
commit cb83069c67
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/job-results/job-results.controller.js
View File

@ -1,4 +1,9 @@
export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count', '$scope', 'ParseTypeChange', 'ParseVariableString', 'jobResultsService', 'eventQueue', '$compile', '$log', 'Dataset', '$q', 'Rest', '$state', 'QuerySet', function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTypeChange, ParseVariableString, jobResultsService, eventQueue, $compile, $log, Dataset, $q, Rest, $state, QuerySet) { export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count', '$scope', 'ParseTypeChange', 'ParseVariableString', 'jobResultsService', 'eventQueue', '$compile', '$log', 'Dataset', '$q', 'Rest', '$state', 'QuerySet', function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTypeChange, ParseVariableString, jobResultsService, eventQueue, $compile, $log, Dataset, $q, Rest, $state, QuerySet) {
// if the job_status hasn't been set by the websocket, set it now
if (!$scope.job_status) {
$scope.job_status = jobData.status;
}
// used for tag search // used for tag search
$scope.job_event_dataset = Dataset.data; $scope.job_event_dataset = Dataset.data;
@ -111,7 +116,6 @@ export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count'
$scope.relaunchJob = function() { $scope.relaunchJob = function() {
jobResultsService.relaunchJob($scope); jobResultsService.relaunchJob($scope);
$state.reload();
}; };
$scope.lessLabels = false; $scope.lessLabels = false;
@ -417,7 +421,7 @@ export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count'
$scope.$on(`ws-jobs`, function(e, data) { $scope.$on(`ws-jobs`, function(e, data) {
if (parseInt(data.unified_job_id, 10) === if (parseInt(data.unified_job_id, 10) ===
parseInt($scope.job.id,10)) { parseInt($scope.job.id,10)) {
$scope.job.status = data.status; $scope.job_status = data.status;
} }
if (parseInt(data.project_id, 10) === if (parseInt(data.project_id, 10) ===
parseInt($scope.job.project,10)) { parseInt($scope.job.project,10)) {

2
awx/ui/client/src/job-results/job-results.partial.html
View File

@ -490,7 +490,7 @@
<div class="StandardOut-panelHeader"> <div class="StandardOut-panelHeader">
<div class="StandardOut-panelHeaderText"> <div class="StandardOut-panelHeaderText">
<i class="JobResults-statusResultIcon <i class="JobResults-statusResultIcon
fa icon-job-{{ job.status }}"> fa icon-job-{{ job_status }}">
</i> </i>
{{ job.name }} {{ job.name }}
</div> </div>