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

Merge pull request #3012 from mabashian/scm-update-schedule-button

Browse Source 
Disabled but clickable schedule action icon during scm update
This commit is contained in:
Michael Abashian
2016-07-15 09:16:31 -04:00
committed by GitHub
parent 0882d26ef8 b78c2241e4
commit 0e4a61119e
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/client/src/controllers/Projects.js
View File

@@ -358,11 +358,8 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
$scope.editSchedules = function(id) { $scope.editSchedules = function(id) {
var project = Find({ list: $scope.projects, key: 'id', val: id }); var project = Find({ list: $scope.projects, key: 'id', val: id });
if (project.scm_type === "Manual" || Empty(project.scm_type)) { if (!(project.scm_type === "Manual" || Empty(project.scm_type)) && !(project.status === 'updating' || project.status === 'running' || project.status === 'pending')) {
// Nothing to do $state.go('projectSchedules', {id: id});
}
else {
$location.path('/projects/' + id + '/schedules');
} }
}; };
} }

7
awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js
View File

@@ -334,11 +334,8 @@ export default ['$scope', '$rootScope', '$location', '$log',
$scope.editSchedules = function(id) { $scope.editSchedules = function(id) {
var project = Find({ list: $scope.projects, key: 'id', val: id }); var project = Find({ list: $scope.projects, key: 'id', val: id });
if (project.scm_type === "Manual" || Empty(project.scm_type)) { if (!(project.scm_type === "Manual" || Empty(project.scm_type)) && !(project.status === 'updating' || project.status === 'running' || project.status === 'pending')) {
// Nothing to do $state.go('projectSchedules', {id: id});
}
else {
$location.path('/projects/' + id + '/schedules');
} }
}; };