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

Fixed editNodeHelpMessage logic that was broken during merge conflict

Browse Source
This commit is contained in:
mabashian 2018-11-20 10:34:59 -05:00
parent 4c14727762
commit 1cfcaa72ad
4 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js
View File

@ -17,6 +17,7 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
let promptWatcher, credentialsWatcher, surveyQuestionWatcher, listPromises = [];
$scope.strings = TemplatesStrings;
$scope.editNodeHelpMessage = null;
let templateList = _.cloneDeep(TemplateList);
delete templateList.actions;
@ -139,6 +140,8 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
const finishConfiguringEdit = () => {
$scope.editNodeHelpMessage = getEditNodeHelpMessage($scope.nodeConfig.node.fullUnifiedJobTemplateObject);
if (!$scope.readOnly) {
let jobTemplate = new JobTemplate();
@ -391,6 +394,36 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
};
const getEditNodeHelpMessage = (selectedTemplate) => {
if (selectedTemplate.type === "workflow_job_template") {
if ($scope.workflowJobTemplateObj.inventory) {
if (selectedTemplate.ask_inventory_on_launch) {
return $scope.strings.get('workflow_maker.INVENTORY_WILL_OVERRIDE');
}
}
if ($scope.workflowJobTemplateObj.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 ($scope.workflowJobTemplateObj.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 ($scope.workflowJobTemplateObj.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;
};
const templateManuallySelected = (selectedTemplate) => {
if (promptWatcher) {
@ -406,6 +439,7 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
}
$scope.promptData = null;
$scope.editNodeHelpMessage = getEditNodeHelpMessage(selectedTemplate);
if (selectedTemplate.type === "job_template") {
let jobTemplate = new JobTemplate();

1
awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.directive.js
View File

@ -11,6 +11,7 @@ export default ['templateUrl',
return {
scope: {
nodeConfig: '<',
workflowJobTemplateObj: '<',
cancel: '&',
select: '&',
readOnly: '<'

2
awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html
View File

@ -233,6 +233,8 @@
</div>
</div>
</div>
<div ng-show="editNodeHelpMessage" class="WorkflowMaker-formHelp" ng-bind="editNodeHelpMessage"></div>
<br />
<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="!readOnly" ng-click="cancel()"> {{:: strings.get('CANCEL') }}</button>

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

@ -98,7 +98,7 @@
</div>
<div class="WorkflowMaker-contentRight">
<span ng-if="formState.showNodeForm">
<workflow-node-form node-config="nodeConfig" node="nodeBeingWorkedOn" select="confirmNodeForm(selectedTemplate, promptData, edgeType)" cancel="cancelNodeForm()" read-only="!workflowJobTemplateObj.summary_fields.user_capabilities.edit"/>
<workflow-node-form node-config="nodeConfig" workflow-job-template-obj="workflowJobTemplateObj" select="confirmNodeForm(selectedTemplate, promptData, edgeType)" cancel="cancelNodeForm()" read-only="!workflowJobTemplateObj.summary_fields.user_capabilities.edit"/>
</span>
<span ng-if="formState.showLinkForm">
<workflow-link-form link-config="linkConfig" read-only="!workflowJobTemplateObj.summary_fields.user_capabilities.edit" select="confirmLinkForm(edgeType)" cancel="cancelLinkForm()" unlink="unlink()"/>