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

Merge pull request #177 from mabashian/7384-scm-src-vars

Browse Source 
Fixed scm inv source source vars
This commit is contained in:
Michael Abashian
2017-08-07 14:17:06 -04:00
committed by GitHub
parent 119d96c950 2f7f6d84fb
commit e4360b9870
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js
View File

@@ -309,7 +309,8 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition',
}; };
if ($scope.source) { 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; params.source = $scope.source.value;
if ($scope.source.value === 'scm') { if ($scope.source.value === 'scm') {
params.update_on_project_update = $scope.update_on_project_update; params.update_on_project_update = $scope.update_on_project_update;

3
awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js
View File

@@ -347,7 +347,8 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString',
}; };
if ($scope.source) { 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; params.source = $scope.source.value;
if ($scope.source.value === 'scm') { if ($scope.source.value === 'scm') {
params.update_on_project_update = $scope.update_on_project_update; params.update_on_project_update = $scope.update_on_project_update;