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

fix variable setup for certain inventory source types

Browse Source
This commit is contained in:
John Mitchell
2017-05-30 13:32:17 -04:00
parent 1eca41ce92
commit dc9eb51959
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
awx/ui/client/src/inventories/sources/edit/sources-edit.controller.js
View File

@@ -220,9 +220,12 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString',
$scope.sourceChange = function(source) { $scope.sourceChange = function(source) {
$scope.source = source; $scope.source = source;
if (source.value === 'ec2' || source.value === 'custom' ||
source.value === 'vmware' || source.value === 'openstack' || source = source.value;
source.value === 'scm') {
if (source === 'ec2' || source === 'custom' ||
source === 'vmware' || source === 'openstack' ||
source === 'scm') {
var varName; var varName;
if (source === 'scm') { if (source === 'scm') {
@@ -253,20 +256,31 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString',
function initSourceSelect() { function initSourceSelect() {
$scope.source = _.find($scope.source_type_options, { value: inventorySourceData.source }); $scope.source = _.find($scope.source_type_options, { value: inventorySourceData.source });
var source = $scope.source.value;
CreateSelect2({ CreateSelect2({
element: '#inventory_source_source', element: '#inventory_source_source',
multiple: false multiple: false
}); });
// After the source is set, conditional fields will be visible
// CodeMirror is buggy if you instantiate it in a not-visible element if (source === 'ec2' || source === 'custom' ||
// So we initialize it here instead of the init() routine source === 'vmware' || source === 'openstack' ||
if (inventorySourceData.source === 'ec2' || inventorySourceData.source === 'openstack' || source === 'scm') {
inventorySourceData.source === 'custom' || inventorySourceData.source === 'vmware') {
$scope[inventorySourceData.source + '_variables'] = inventorySourceData.source_vars === null || inventorySourceData.source_vars === '' ? '---' : ParseVariableString(inventorySourceData.source_vars); var varName;
if (source === 'scm') {
varName = 'custom_variables';
} else {
varName = source + '_variables';
}
$scope[varName] = $scope[varName] === (null || undefined) ? '---' : $scope[varName];
ParseVariableString(inventorySourceData.source_vars);
ParseTypeChange({ ParseTypeChange({
scope: $scope, scope: $scope,
field_id: inventorySourceData.source + '_variables', field_id: varName,
variable: inventorySourceData.source + '_variables', variable: varName,
parse_variable: 'envParseType', parse_variable: 'envParseType',
}); });
} }