From 2f7f6d84fbe5af1ba85e699e4695bc8e9305b9f7 Mon Sep 17 00:00:00 2001 From: mabashian Date: Thu, 3 Aug 2017 14:34:49 -0400 Subject: [PATCH] Fixed scm inv source source vars --- .../inventories/related/sources/add/sources-add.controller.js | 3 ++- .../related/sources/edit/sources-edit.controller.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js index 1c30e97232..3989160a1c 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js @@ -309,7 +309,8 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition', }; if ($scope.source) { - params.source_vars = $scope[$scope.source.value + '_variables'] === '---' || $scope[$scope.source.value + '_variables'] === '{}' ? null : $scope[$scope.source.value + '_variables']; + let source_vars = $scope.source.value === 'scm' ? $scope.custom_variables : $scope[$scope.source.value + '_variables']; + params.source_vars = source_vars === '---' || source_vars === '{}' ? null : source_vars; params.source = $scope.source.value; if ($scope.source.value === 'scm') { params.update_on_project_update = $scope.update_on_project_update; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js index 883bb72c90..e9beb3a906 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js @@ -347,7 +347,8 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString', }; if ($scope.source) { - params.source_vars = $scope[$scope.source.value + '_variables'] === '---' || $scope[$scope.source.value + '_variables'] === '{}' ? null : $scope[$scope.source.value + '_variables']; + let source_vars = $scope.source.value === 'scm' ? $scope.custom_variables : $scope[$scope.source.value + '_variables']; + params.source_vars = source_vars === '---' || source_vars === '{}' ? null : source_vars; params.source = $scope.source.value; if ($scope.source.value === 'scm') { params.update_on_project_update = $scope.update_on_project_update;