diff --git a/awx/ui/static/js/controllers/JobTemplates.js b/awx/ui/static/js/controllers/JobTemplates.js index aa967d330c..c3f0bf919c 100644 --- a/awx/ui/static/js/controllers/JobTemplates.js +++ b/awx/ui/static/js/controllers/JobTemplates.js @@ -467,14 +467,18 @@ function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log, $routeP if ($scope.watchProjectUnregister) { $scope.watchProjectUnregister(); } - $scope.watchProjectUnregister = $scope.$watch('project_name', function (newValue, oldValue) { - if (oldValue !== newValue && newValue !== '' && newValue !== null && newValue !== undefined) { - $scope.playbook = null; + $scope.watchProjectUnregister = $scope.$watch('project', function (newValue, oldValue) { + if (newValue !== oldValue) { + if (!Empty(oldValue)) { + $scope.playbook = null; + } getPlaybooks($scope.project); checkSCMStatus(); } }); + + // Turn off 'Wait' after both cloud credential and playbook list come back if ($scope.removeJobTemplateLoadFinished) { $scope.removeJobTemplateLoadFinished();