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

Add prompt for extra vars to wfjt

Browse Source
This commit is contained in:
mabashian
2019-02-21 11:37:46 -05:00
parent 09684e2c41
commit 0ce70c08bd
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/serializers.py
View File

@@ -4495,8 +4495,8 @@ class WorkflowJobLaunchSerializer(BaseSerializer):
fields = ('ask_inventory_on_launch', 'can_start_without_user_input', 'defaults', 'extra_vars', fields = ('ask_inventory_on_launch', 'can_start_without_user_input', 'defaults', 'extra_vars',
'inventory', 'survey_enabled', 'variables_needed_to_start', 'inventory', 'survey_enabled', 'variables_needed_to_start',
'node_templates_missing', 'node_prompts_rejected', 'node_templates_missing', 'node_prompts_rejected',
'workflow_job_template_data', 'survey_enabled') 'workflow_job_template_data', 'survey_enabled', 'ask_variables_on_launch')
read_only_fields = ('ask_inventory_on_launch',) read_only_fields = ('ask_inventory_on_launch', 'ask_variables_on_launch')
def get_survey_enabled(self, obj): def get_survey_enabled(self, obj):
if obj: if obj:

2
awx/ui/client/src/templates/prompt/prompt.controller.js
View File

@@ -52,12 +52,10 @@ export default [ 'ProcessErrors', 'CredentialTypeModel', 'TemplatesStrings',
.then( (response) => { .then( (response) => {
vm.promptDataClone.prompts.credentials.credentialTypes = {}; vm.promptDataClone.prompts.credentials.credentialTypes = {};
vm.promptDataClone.prompts.credentials.credentialTypeOptions = []; vm.promptDataClone.prompts.credentials.credentialTypeOptions = [];
let machineCredTypeId = null;
response.data.results.forEach((credentialTypeRow => { response.data.results.forEach((credentialTypeRow => {
vm.promptDataClone.prompts.credentials.credentialTypes[credentialTypeRow.id] = credentialTypeRow.kind; vm.promptDataClone.prompts.credentials.credentialTypes[credentialTypeRow.id] = credentialTypeRow.kind;
if(credentialTypeRow.kind.match(/^(cloud|net|ssh|vault)$/)) { if(credentialTypeRow.kind.match(/^(cloud|net|ssh|vault)$/)) {
if(credentialTypeRow.kind === 'ssh') { if(credentialTypeRow.kind === 'ssh') {
machineCredTypeId = credentialTypeRow.id;
vm.promptDataClone.prompts.credentials.credentialKind = credentialTypeRow.id.toString(); vm.promptDataClone.prompts.credentials.credentialKind = credentialTypeRow.id.toString();
} }
vm.promptDataClone.prompts.credentials.credentialTypeOptions.push({ vm.promptDataClone.prompts.credentials.credentialTypeOptions.push({

4
awx/ui/client/src/templates/workflows.form.js
View File

@@ -115,6 +115,10 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
dataTitle: i18n._('Extra Variables'), dataTitle: i18n._('Extra Variables'),
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body", dataContainer: "body",
subCheckbox: {
variable: 'ask_variables_on_launch',
text: i18n._('Prompt on launch')
},
ngDisabled: '!(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)' // TODO: get working ngDisabled: '!(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)' // TODO: get working
}, },
checkbox_group: { checkbox_group: {

2
awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js
View File

@@ -69,7 +69,9 @@ export default [
data[fld] = $scope[fld]; data[fld] = $scope[fld];
} }
} }
data.ask_inventory_on_launch = Boolean($scope.ask_inventory_on_launch); data.ask_inventory_on_launch = Boolean($scope.ask_inventory_on_launch);
data.ask_variables_on_launch = Boolean($scope.ask_variables_on_launch);
data.extra_vars = ToJSON($scope.parseType, data.extra_vars = ToJSON($scope.parseType,
$scope.variables, true); $scope.variables, true);

2
awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js
View File

@@ -56,6 +56,7 @@ export default [
$scope.parseType = 'yaml'; $scope.parseType = 'yaml';
$scope.includeWorkflowMaker = false; $scope.includeWorkflowMaker = false;
$scope.ask_inventory_on_launch = workflowJobTemplateData.ask_inventory_on_launch; $scope.ask_inventory_on_launch = workflowJobTemplateData.ask_inventory_on_launch;
$scope.ask_variables_on_launch = (workflowJobTemplateData.ask_variables_on_launch) ? true : false;
if (Inventory){ if (Inventory){
$scope.inventory = Inventory.id; $scope.inventory = Inventory.id;
@@ -92,6 +93,7 @@ export default [
} }
data.ask_inventory_on_launch = Boolean($scope.ask_inventory_on_launch); data.ask_inventory_on_launch = Boolean($scope.ask_inventory_on_launch);
data.ask_variables_on_launch = Boolean($scope.ask_variables_on_launch);
data.extra_vars = ToJSON($scope.parseType, data.extra_vars = ToJSON($scope.parseType,
$scope.variables, true); $scope.variables, true);