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

User related.current_update for SCM project status detail when availble (i.e. while an update is running). Otherwise use related.last_update.

Browse Source
This commit is contained in:
chouseknecht
2013-09-13 00:01:58 -04:00
parent d79d20a630
commit fef625445f
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,13 +82,16 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
} }
} }
if (project.scm_type !== null) { if (project.scm_type !== null) {
if (project.related.last_update !== undefined && project.status !== 'updating') { if (project.related.current_update) {
ProjectStatus({ project_id: id, last_update: project.related.current_update });
}
else if (project.related.last_update) {
ProjectStatus({ project_id: id, last_update: project.related.last_update }); ProjectStatus({ project_id: id, last_update: project.related.last_update });
} }
else if (project.status == 'updating') { // else if (project.status == 'updating') {
Alert('Pending Status', 'An update is currently running. Status details cannot be viewed until the update process ' + // Alert('Pending Status', 'An update is currently running. Status details cannot be viewed until the update process ' +
' completes. Use the refresh button to monitor progress of the update process.', 'alert-info'); // ' completes. Use the refresh button to monitor progress of the update process.', 'alert-info');
} // }
else { else {
Alert('No Updates Available', 'There is no SCM update information available for this project. An update has not yet been ' + 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'); ' completed. If you have not already done so, start an update for this project.', 'alert-info');