External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 14:09:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fixed project status mismatch.

Browse Source
This commit is contained in:
Chris Houseknecht
2014-04-01 12:57:34 -04:00
parent 6b3d5da500
commit 9efa5e28ce
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -337,7 +337,7 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
// Do not respond. Button appears greyed out as if it is disabled. Not disabled though, because we need mouse over event // Do not respond. Button appears greyed out as if it is disabled. Not disabled though, because we need mouse over event
// to work. So user can click, but we just won't do anything. // to work. So user can click, but we just won't do anything.
//Alert('Missing SCM Setup', 'Before running an SCM update, edit the project and provide the SCM access information.', 'alert-info'); //Alert('Missing SCM Setup', 'Before running an SCM update, edit the project and provide the SCM access information.', 'alert-info');
} else if (project.status === 'updating') { } else if (project.status === 'updating' || project.status === 'running') {
Alert('Update in Progress', 'The SCM update process is running. Use the Refresh button to monitor the status.', 'alert-info'); Alert('Update in Progress', 'The SCM update process is running. Use the Refresh button to monitor the status.', 'alert-info');
} else { } else {
ProjectUpdate({ scope: $scope, project_id: project.id }); ProjectUpdate({ scope: $scope, project_id: project.id });

4
awx/ui/static/js/lists/Projects.js
View File

@@ -109,13 +109,13 @@ angular.module('ProjectsListDefinition', [])
"delete": { "delete": {
ngClick: "deleteProject(project.id, project.name)", ngClick: "deleteProject(project.id, project.name)",
awToolTip: 'Delete the project', awToolTip: 'Delete the project',
ngShow: "project.status !== 'updating'", ngShow: "project.status !== 'updating' && project.status !== 'running'",
dataPlacement: 'top' dataPlacement: 'top'
}, },
cancel: { cancel: {
ngClick: "cancelUpdate(project.id, project.name)", ngClick: "cancelUpdate(project.id, project.name)",
awToolTip: 'Cancel the SCM update', awToolTip: 'Cancel the SCM update',
ngShow: "project.status == 'updating'", ngShow: "project.status == 'updating' || project.status == 'running'",
dataPlacement: 'top' dataPlacement: 'top'
} }
} }