From 0331c7a2c78ca7f3640837418ecb7dbdaad12b23 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Thu, 14 Jul 2016 15:18:57 -0400 Subject: [PATCH 1/2] Fixed bug where schedule icon was disabled but clickable while scm update was running --- awx/ui/client/src/controllers/Projects.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/src/controllers/Projects.js b/awx/ui/client/src/controllers/Projects.js index 4dbb111f79..64f0bfc8c1 100644 --- a/awx/ui/client/src/controllers/Projects.js +++ b/awx/ui/client/src/controllers/Projects.js @@ -358,11 +358,8 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams, $scope.editSchedules = function(id) { var project = Find({ list: $scope.projects, key: 'id', val: id }); - if (project.scm_type === "Manual" || Empty(project.scm_type)) { - // Nothing to do - } - else { - $location.path('/projects/' + id + '/schedules'); + if (!(project.scm_type === "Manual" || Empty(project.scm_type)) && !(project.status === 'updating' || project.status === 'running' || project.status === 'pending')) { + $state.go('projectSchedules', {id: id}); } }; } From b78c2241e4901a421fccc81f5c08f4f69066b1a8 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Thu, 14 Jul 2016 15:26:29 -0400 Subject: [PATCH 2/2] Fixed bug where schedule icon was disabled but clickable while scm update was running --- .../controllers/organizations-projects.controller.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js index 406a1d1b78..a718b423c2 100644 --- a/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js +++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js @@ -334,11 +334,8 @@ export default ['$scope', '$rootScope', '$location', '$log', $scope.editSchedules = function(id) { var project = Find({ list: $scope.projects, key: 'id', val: id }); - if (project.scm_type === "Manual" || Empty(project.scm_type)) { - // Nothing to do - } - else { - $location.path('/projects/' + id + '/schedules'); + if (!(project.scm_type === "Manual" || Empty(project.scm_type)) && !(project.status === 'updating' || project.status === 'running' || project.status === 'pending')) { + $state.go('projectSchedules', {id: id}); } };