From 40c50300f74a7058173ff58ebb0cf407c4f3c387 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Fri, 10 Feb 2017 20:09:39 -0500 Subject: [PATCH 1/2] Fix bug with job_type = scan not loading Default project correctly --- .../edit-job-template/job-template-edit.controller.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js index 8da8a4c034..c6e2770a50 100644 --- a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js +++ b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js @@ -53,6 +53,10 @@ export default $scope.parseType = 'yaml'; $scope.showJobType = false; + if(!$scope.project) { + $scope.project_name = 'Default'; + } + SurveyControllerInit({ scope: $scope, parent_scope: $scope, From 1df4adc957e7c88bbf4b74649b1de920c1556ff2 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Fri, 10 Feb 2017 20:16:34 -0500 Subject: [PATCH 2/2] Check job_type as well as !project --- .../edit-job-template/job-template-edit.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js index c6e2770a50..8312c09543 100644 --- a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js +++ b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js @@ -53,7 +53,7 @@ export default $scope.parseType = 'yaml'; $scope.showJobType = false; - if(!$scope.project) { + if($scope.job_type && $scope.job_type.value === 'scan' && !$scope.project) { $scope.project_name = 'Default'; }