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

Fixed error Cannot read property 'type' of undefined in console when selecting a project or inventory node

Browse Source
This commit is contained in:
mabashian
2018-11-20 14:54:30 -05:00
parent 625c6c30fc
commit 1477bbae30
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,32 +139,35 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
}; };
const getEditNodeHelpMessage = (selectedTemplate) => { const getEditNodeHelpMessage = (selectedTemplate) => {
if (selectedTemplate.type === "workflow_job_template") { if (selectedTemplate) {
if ($scope.workflowJobTemplateObj.inventory) { if (selectedTemplate.type === "workflow_job_template") {
if (selectedTemplate.ask_inventory_on_launch) { if ($scope.workflowJobTemplateObj.inventory) {
return $scope.strings.get('workflow_maker.INVENTORY_WILL_OVERRIDE'); 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 ($scope.workflowJobTemplateObj.ask_inventory_on_launch) { if (selectedTemplate.type === "job_template") {
if (selectedTemplate.ask_inventory_on_launch) { if ($scope.workflowJobTemplateObj.inventory) {
return $scope.strings.get('workflow_maker.INVENTORY_PROMPT_WILL_OVERRIDE'); 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');
} }
} }
} }
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; return null;
}; };
@@ -601,7 +604,7 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
.then(() => { .then(() => {
if ($scope.nodeConfig.mode === "edit") { if ($scope.nodeConfig.mode === "edit") {
// Make sure that we have the full unified job template object // Make sure that we have the full unified job template object
if (!$scope.nodeConfig.node.fullUnifiedJobTemplateObject && _.get($scope, 'nodeConfig.node.originalNodeObject.summary_fields.unified_job_template.unified_job_type') === 'job') { if (!$scope.nodeConfig.node.fullUnifiedJobTemplateObject) {
// This is a node that we got back from the api with an incomplete // This is a node that we got back from the api with an incomplete
// unified job template so we're going to pull down the whole object // unified job template so we're going to pull down the whole object
TemplatesService.getUnifiedJobTemplate($scope.nodeConfig.node.originalNodeObject.summary_fields.unified_job_template.id) TemplatesService.getUnifiedJobTemplate($scope.nodeConfig.node.originalNodeObject.summary_fields.unified_job_template.id)
@@ -671,7 +674,7 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
}); });
$scope.$watchGroup(['wf_maker_templates', 'wf_maker_projects', 'wf_maker_inventory_sources', 'activeTab'], () => { $scope.$watchGroup(['wf_maker_templates', 'wf_maker_projects', 'wf_maker_inventory_sources', 'activeTab'], () => {
const unifiedJobTemplateId = _.get($scope, 'nodeConfig.node.fullUnifiedJobTemplateObject.id') || _.get($scope, 'nodeConfig.node.unifiedJobTemplate.id') || null; const unifiedJobTemplateId = _.get($scope, 'selectedTemplate.id') || null;
switch($scope.activeTab) { switch($scope.activeTab) {
case 'jobs': case 'jobs':
$scope.wf_maker_templates.forEach((row, i) => { $scope.wf_maker_templates.forEach((row, i) => {