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

No surveys for scan job templates

Browse Source 
hiding the survey checkboxes, and setting 'survey_enabled' to false for scan job template saves
This commit is contained in:
Jared Tabor 2015-06-01 14:11:36 -04:00
parent 9d419820d5
commit c485d3f3d1
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
awx/ui/static/js/controllers/JobTemplates.js
View File

@ -3,7 +3,7 @@
*
* All Rights Reserved
*************************************************/
/**
* @ngdoc function
* @name controllers.function:JobTemplate
@ -417,8 +417,6 @@ export function JobTemplatesAdd($scope, $rootScope, $compile, $location, $log, $
$scope.jobTypeChange = function(){
if($scope.job_type){
if($scope.job_type.value === 'scan'){
// $scope.project_name = 'Default';
// $scope.project = null;
$scope.toggleScanInfo();
}
else if($scope.project_name === "Default"){
@ -614,6 +612,10 @@ export function JobTemplatesAdd($scope, $rootScope, $compile, $location, $log, $
});
});
// users can't save a survey with a scan job
if($scope.job_type.value === "scan" && $scope.survey_enabled === true){
$scope.survey_enabled = false;
}
if($scope.survey_enabled === true && $scope.survey_exists!==true){
// $scope.$emit("PromptForSurvey");
@ -732,8 +734,6 @@ export function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log,
$scope.jobTypeChange = function(){
if($scope.job_type){
if($scope.job_type.value === 'scan'){
// $scope.project_name = 'Default';
// $scope.project = null;
$scope.toggleScanInfo();
}
else if($scope.project_name === "Default"){
@ -742,6 +742,7 @@ export function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log,
// $scope.playbook = 'null';
$scope.job_templates_form.playbook.$setPristine();
}
}
};
@ -1109,6 +1110,10 @@ export function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log,
});
});
// users can't save a survey with a scan job
if($scope.job_type.value === "scan" && $scope.survey_enabled === true){
$scope.survey_enabled = false;
}
if($scope.survey_enabled === true && $scope.survey_exists!==true){
// $scope.$emit("PromptForSurvey");

15
awx/ui/static/js/forms/JobTemplates.js
View File

@ -3,7 +3,7 @@
*
* All Rights Reserved
*************************************************/
/**
* @ngdoc function
* @name forms.function:JobTemplate
@ -114,17 +114,6 @@ export default
dataPlacement: 'right',
dataContainer: "body",
},
// default_scan: {
// label: "Use default scan job project and playbook",
// type: 'checkbox',
// ngChange: 'toggleScanInfo()',
// ngShow: 'job_type.value === "scan" && project_name !== "Default"',
// column: 1,
// awPopOver: "<p>Scan jobs templates use a default project and default playbook. Uncheck this box to override these defaults.</p>",
// dataTitle: 'Scan jobs',
// dataPlacement: 'right',
// dataContainer: "body"
// },
default_scan: {
type: 'custom',
column: 1,
@ -263,6 +252,7 @@ export default
editRequird: false,
awFeature: 'surveys',
ngChange: "surveyEnabled()",
ngHide: "job_type.value === 'scan'",
column: 2,
awPopOver: "<p>If checked, user will be prompted at job launch with a series of questions related to the job.</p>",
dataPlacement: 'right',
@ -272,6 +262,7 @@ export default
create_survey: {
type: 'custom',
column: 2,
ngHide: "job_type.value === 'scan'" ,
control: '<button type="button" class="btn btn-sm btn-primary" id="job_templates_create_survey_btn" ng-show="survey_enabled" ng-click="addSurvey()"><i class="fa fa-pencil"></i> Create Survey</button>'+
'<button style="display:none;" type="button" class="btn btn-sm btn-primary" id="job_templates_edit_survey_btn" ng-show="survey_enabled" ng-click="editSurvey()"><i class="fa fa-pencil"></i> Edit Survey</button>'+
'<button style="display:none;margin-left:5px" type="button" class="btn btn-sm btn-primary" id="job_templates_delete_survey_btn" ng-show="survey_enabled" ng-click="deleteSurvey()"><i class="fa fa-trash-o"></i> Delete Survey</button>'+