External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 18:09:57 -03:30
Code Issues Packages Projects Releases Wiki Activity

AC-1257 view project update status

Browse Source 
Since we're not refreshing the list of projects after submission of an update request, the UI does not have the most recent update ID in memory. Before launching the log viewer dialog it now requests the latest project record from the API and initializes with the correct ID.
This commit is contained in:
Chris Houseknecht 2014-06-12 16:36:46 -04:00
parent 94e843dc71
commit fc7ecc4c55
2 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,7 +175,7 @@ function JobDetailController ($scope, $compile, $routeParams, $log, ClearScope,
}
scope.removeJobReady = scope.$on('JobReady', function(e, events_url) {
// Job finished loading. Now get the set of plays
var url = scope.job.related.job_plays + '?order_by=id';
var url = scope.job.url + 'job_plays/?order_by=id';
Rest.setUrl(url);
Rest.get()
.success( function(data) {

51
awx/ui/static/js/controllers/Projects.js
View File

@ -203,6 +203,30 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
$location.path($location.path() + '/' + id);
};
if ($scope.removeShowLogViewer) {
$scope.removeShowLogViewer();
}
$scope.removeShowLogViewer = $scope.$on('ShowLogViewer', function(e, data) {
if (data.related.current_update) {
Wait('start');
LogViewer({
scope: $scope,
url: data.related.current_update,
getIcon: GetProjectIcon
});
} else if (data.related.last_update) {
Wait('start');
LogViewer({
scope: $scope,
url: data.related.last_update,
getIcon: GetProjectIcon
});
} else {
Alert('No Updates Available', 'There is no SCM update information available for this project. An update has not yet been ' +
' completed. If you have not already done so, start an update for this project.', 'alert-info');
}
});
$scope.showSCMStatus = function (id) {
// Refresh the project list
var project = Find({ list: $scope.projects, key: 'id', val: id });
@ -210,24 +234,16 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
Alert('No SCM Configuration', 'The selected project is not configured for SCM. To configure for SCM, edit the project and provide SCM settings, ' +
'and then run an update.', 'alert-info');
} else {
if (project.related.current_update) {
Wait('start');
LogViewer({
scope: $scope,
url: project.related.current_update,
getIcon: GetProjectIcon
// Refresh what we have in memory to insure we're accessing the most recent status record
Rest.setUrl(project.url);
Rest.get()
.success(function(data) {
$scope.$emit('ShowLogViewer', data);
})
.error(function(data, status) {
ProcessErrors($scope, data, status, null, { hdr: 'Error!',
msg: 'Project lookup failed. GET returned: ' + status });
});
} else if (project.related.last_update) {
Wait('start');
LogViewer({
scope: $scope,
url: project.related.last_update,
getIcon: GetProjectIcon
});
} else {
Alert('No Updates Available', 'There is no SCM update information available for this project. An update has not yet been ' +
' completed. If you have not already done so, start an update for this project.', 'alert-info');
}
}
};
@ -242,7 +258,6 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
$scope.search(list.iterator);
})
.error(function (data, status) {
Wait('stop');
ProcessErrors($scope, data, status, null, { hdr: 'Error!',
msg: 'Call to ' + url + ' failed. DELETE returned status: ' + status });
});