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

Revert inadvertent variable name changes in old ui app

Browse Source
This commit is contained in:
mabashian 2019-11-21 18:22:05 -05:00
parent 37a1e5d9b0
commit 61c38eabf8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
launchConf.variables_needed_to_start.length !== 0;
$scope.strings = TemplatesStrings;
$scope.editWorkflowHelpMessage = null;
$scope.editNodeHelpMessage = null;
$scope.templateList = WorkflowNodeFormService.templateListDefinition();
$scope.inventorySourceList = WorkflowNodeFormService.inventorySourceListDefinition();
@ -177,7 +177,7 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
}
};
const getEditWorkflowHelpMessage = (selectedTemplate, workflowJobTemplateObj) => {
const getEditNodeHelpMessage = (selectedTemplate, workflowJobTemplateObj) => {
if (selectedTemplate) {
if (selectedTemplate.type === "workflow_job_template") {
if (workflowJobTemplateObj.inventory && selectedTemplate.ask_inventory_on_launch) {
@ -215,7 +215,7 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
const ujt = _.get($scope, 'nodeConfig.node.fullUnifiedJobTemplateObject');
const templateType = _.get(ujt, 'type');
$scope.editWorkflowHelpMessage = getEditWorkflowHelpMessage(ujt, $scope.workflowJobTemplateObj);
$scope.editNodeHelpMessage = getEditNodeHelpMessage(ujt, $scope.workflowJobTemplateObj);
if (!$scope.readOnly) {
let jobTemplate = templateType === "workflow_job_template" ? new WorkflowJobTemplate() : new JobTemplate();
@ -670,7 +670,7 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
timeoutMinutes: 0,
timeoutSeconds: 0
};
$scope.editWorkflowHelpMessage = getEditWorkflowHelpMessage(selectedTemplate, $scope.workflowJobTemplateObj);
$scope.editNodeHelpMessage = getEditNodeHelpMessage(selectedTemplate, $scope.workflowJobTemplateObj);
if (selectedTemplate.type === "job_template" || selectedTemplate.type === "workflow_job_template") {
let jobTemplate = selectedTemplate.type === "workflow_job_template" ? new WorkflowJobTemplate() : new JobTemplate();

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

@ -279,7 +279,7 @@
</div>
</div>
</div>
<div ng-show="editWorkflowHelpMessage && activeTab === 'templates'" class="WorkflowMaker-formHelp" ng-bind="editWorkflowHelpMessage"></div>
<div ng-show="editNodeHelpMessage && activeTab === 'templates'" 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="jobNodeState.showPromptButton && activeTab == 'templates' " ng-click="openPromptModal()"> {{:: strings.get('prompt.PROMPT') }}</button>