External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 18:37:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2225 from mabashian/job-launch-optional-survey

Browse Source 
Fixed job launch bugs
This commit is contained in:
Michael Abashian
2016-06-08 18:31:03 -04:00
parent ceea7fd62a 68bf0e57a6
commit 481859490d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/client/src/job-submission/job-submission.controller.js
View File

@@ -187,8 +187,11 @@ export default
updateRequiredPasswords(); updateRequiredPasswords();
} }
if($scope.can_start_without_user_input && !$scope.ask_inventory_on_launch && !$scope.ask_credential_on_launch && !$scope.has_other_prompts) { if( (isRelaunch && !$scope.password_needed) || (!isRelaunch && $scope.can_start_without_user_input && !$scope.ask_inventory_on_launch && !$scope.ask_credential_on_launch && !$scope.has_other_prompts && !$scope.survey_enabled)) {
// The job can be launched without any user input // The job can be launched if
// a) It's a relaunch and no passwords are needed
// or
// b) It's not a relaunch and there's not any prompting/surveys
launchJob(); launchJob();
Wait('stop'); Wait('stop');
} }