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

add inventory help messages for workflow node edit

Browse Source
This commit is contained in:
Jake McDermott 2018-11-11 23:23:49 -05:00
parent 9a4667c6c7
commit 75c2d1eda1
No known key found for this signature in database
GPG Key ID: 9A6F084352C3A0B7
3 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/client/features/templates/templates.strings.js
View File

@ -117,9 +117,12 @@ function TemplatesStrings (BaseString) {
DELETED: t.s('DELETED'),
START: t.s('START'),
DETAILS: t.s('DETAILS'),
TITLE: t.s('WORKFLOW VISUALIZER')
TITLE: t.s('WORKFLOW VISUALIZER'),
INVENTORY_WILL_OVERRIDE: t.s('The inventory of this node will be overridden by the parent workflow inventory.'),
INVENTORY_WILL_NOT_OVERRIDE: t.s('The inventory of this node will not be overridden by the parent workflow inventory.'),
INVENTORY_PROMPT_WILL_OVERRIDE: t.s('The inventory of this node will be overridden if a parent workflow inventory is provided at launch.'),
INVENTORY_PROMPT_WILL_NOT_OVERRIDE: t.s('The inventory of this node will not be overridden if a parent workflow inventory is provided at launch.'),
}
}
TemplatesStrings.$inject = ['BaseStringService'];

40
awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
View File

@ -571,6 +571,8 @@ export default ['$scope', 'WorkflowService', 'TemplatesService',
/* EDIT NODE FUNCTIONS */
$scope.startEditNode = function (nodeToEdit) {
$scope.editNodeHelpMessage = null;
if (!$scope.nodeBeingEdited || ($scope.nodeBeingEdited && $scope.nodeBeingEdited.id !== nodeToEdit.id)) {
if ($scope.placeholderNode || $scope.nodeBeingEdited) {
$scope.cancelNodeForm();
@ -989,6 +991,42 @@ export default ['$scope', 'WorkflowService', 'TemplatesService',
}
};
function getEditNodeHelpMessage(workflowTemplate, selectedTemplate) {
if (selectedTemplate.type === "workflow_job_template") {
if (workflowTemplate.inventory) {
if (selectedTemplate.ask_inventory_on_launch) {
return $scope.strings.get('workflow_maker.INVENTORY_WILL_OVERRIDE');
}
}
if (workflowTemplate.ask_inventory_on_launch) {
if (selectedTemplate.ask_inventory_on_launch) {
return $scope.strings.get('workflow_maker.INVENTORY_PROMPT_WILL_OVERRIDE');
}
}
}
if (selectedTemplate.type === "job_template") {
if (workflowTemplate.inventory) {
if (selectedTemplate.ask_inventory_on_launch) {
return $scope.strings.get('workflow_maker.INVENTORY_WILL_OVERRIDE');
}
return $scope.strings.get('workflow_maker.INVENTORY_WILL_NOT_OVERRIDE');
}
if (workflowTemplate.ask_inventory_on_launch) {
if (selectedTemplate.ask_inventory_on_launch) {
return $scope.strings.get('workflow_maker.INVENTORY_PROMPT_WILL_OVERRIDE');
}
return $scope.strings.get('workflow_maker.INVENTORY_PROMPT_WILL_NOT_OVERRIDE');
}
}
return null;
}
$scope.templateManuallySelected = function (selectedTemplate) {
if (promptWatcher) {
@ -1004,6 +1042,8 @@ export default ['$scope', 'WorkflowService', 'TemplatesService',
}
$scope.promptData = null;
$scope.editNodeHelpMessage = getEditNodeHelpMessage($scope.treeData.workflow_job_template_obj, selectedTemplate);
if (selectedTemplate.type === "job_template" || selectedTemplate.type === "workflow_job_template") {
let jobTemplate = selectedTemplate.type === "workflow_job_template" ? new WorkflowJobTemplate() : new JobTemplate();

3
awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
View File

@ -133,6 +133,9 @@
</select>
</div>
</div>
<div ng-show="editNodeHelpMessage" class="form-group Form-formGroup Form-formGroup--singleColumn"
<div class="WorkflowMaker-formHelp" ng-bind="editNodeHelpMessage"></div>
</div>
<div class="buttons Form-buttons" id="workflow_maker_controls">
<button type="button" class="btn btn-sm Form-primaryButton Form-primaryButton--noMargin" id="workflow_maker_prompt_btn" ng-show="showPromptButton" ng-click="openPromptModal()"> {{:: strings.get('prompt.PROMPT') }}</button>
<button type="button" class="btn btn-sm Form-cancelButton" id="workflow_maker_cancel_btn" ng-show="(workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)" ng-click="cancelNodeForm()"> {{:: strings.get('CANCEL') }}</button>