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

add prompt on launch for workflow inventory

Browse Source
This commit is contained in:
Jake McDermott
2018-11-07 23:16:43 -05:00
parent a94042def5
commit 2376013d49
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/lib/models/WorkflowJobTemplate.js
View File

@@ -50,8 +50,10 @@ function canLaunchWithoutPrompt () {
const launchData = this.model.launch.GET; const launchData = this.model.launch.GET;
return ( return (
launchData.can_start_without_user_input && // TODO: may need api update
!launchData.survey_enabled // launchData.can_start_without_user_input &&
!launchData.survey_enabled &&
!this.model.GET.ask_inventory_on_launch
); );
} }

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

@@ -81,6 +81,11 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
dataTitle: i18n._('Inventory'), dataTitle: i18n._('Inventory'),
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body", dataContainer: "body",
subCheckbox: {
variable: 'ask_inventory_on_launch',
ngChange: 'workflow_job_template_form.inventory_name.$validate()',
text: i18n._('Prompt on launch')
},
ngDisabled: '!(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate) || !canEditInventory', ngDisabled: '!(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate) || !canEditInventory',
}, },
labels: { labels: {

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

@@ -75,6 +75,7 @@ export default [
data[fld] = $scope[fld]; data[fld] = $scope[fld];
} }
} }
data.ask_inventory_on_launch = Boolean($scope.ask_inventory_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

@@ -88,6 +88,8 @@ export default [
} }
} }
data.ask_inventory_on_launch = Boolean($scope.ask_inventory_on_launch);
data.extra_vars = ToJSON($scope.parseType, data.extra_vars = ToJSON($scope.parseType,
$scope.variables, true); $scope.variables, true);