External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-03 01:38:50 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5349 from mabashian/5264-scan-job-template

Browse Source 
Set project/playbook to defaults when null
This commit is contained in:
Michael Abashian
2017-02-14 14:58:25 -05:00
committed by GitHub
parent b75b44a998 30595470f7
commit 0a679b32bd
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/helpers/JobTemplates.js
View File

@@ -155,8 +155,7 @@ angular.module('JobTemplatesHelper', ['Utilities'])
scope.can_edit = data.summary_fields.user_capabilities.edit; scope.can_edit = data.summary_fields.user_capabilities.edit;
if ((!scope.project || scope.project === "") && (!scope.playbook || scope.playbook === "")) {
if (scope.project === "" && scope.playbook === "") {
scope.resetProjectToDefault(); scope.resetProjectToDefault();
} }

5
awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
View File

@@ -53,10 +53,6 @@ export default
$scope.parseType = 'yaml'; $scope.parseType = 'yaml';
$scope.showJobType = false; $scope.showJobType = false;
if($scope.job_type && $scope.job_type.value === 'scan' && !$scope.project) {
$scope.project_name = 'Default';
}
SurveyControllerInit({ SurveyControllerInit({
scope: $scope, scope: $scope,
parent_scope: $scope, parent_scope: $scope,
@@ -270,6 +266,7 @@ export default
var dft; var dft;
master = masterObject; master = masterObject;
getPlaybooks($scope.project); getPlaybooks($scope.project);
dft = ($scope.host_config_key === "" || $scope.host_config_key === null) ? false : true; dft = ($scope.host_config_key === "" || $scope.host_config_key === null) ? false : true;