shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Merge pull request #6863 from mabashian/6858-reset-source-type

Browse Source 
Fixed console error when switching source type back to Choose a source
This commit is contained in:
Jared Tabor 2017-07-06 09:46:31 -07:00 committed by GitHub
commit 3107cf0f72
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,10 +130,6 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition',
$scope.credentialBasePath = GetBasePath('credentials') + '?credential_type__kind__in=cloud,network';
if (source === 'custom'){
$scope.credentialBasePath = GetBasePath('inventory_script');
}
if (source === 'ec2' || source === 'custom' || source === 'vmware' || source === 'openstack' || source === 'scm') {
$scope.envParseType = 'yaml';
@ -144,6 +140,7 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition',
varName = source + '_variables';
}
$scope[varName] = $scope[varName] === (null || undefined) ? '---' : $scope[varName];
ParseTypeChange({
scope: $scope,
field_id: varName,

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

@ -341,13 +341,16 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString',
};
$scope.sourceChange = function(source) {
$scope.source = source;
if (source) {
source = source.value;
} else {
source = "";
}
source = source.value;
$scope.credentialBasePath = GetBasePath('credentials') + '?credential_type__kind__in=cloud,network';
if (source === 'ec2' || source === 'custom' ||
source === 'vmware' || source === 'openstack' ||
source === 'scm') {
if (source === 'ec2' || source === 'custom' || source === 'vmware' || source === 'openstack' || source === 'scm') {
$scope.envParseType = 'yaml';
var varName;
if (source === 'scm') {
@ -361,18 +364,26 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString',
scope: $scope,
field_id: varName,
variable: varName,
parse_variable: 'envParseType',
parse_variable: 'envParseType'
});
}
if (source === 'scm') {
$scope.overwrite_vars = true;
$scope.inventory_source_form.inventory_file.$setPristine();
} else {
$scope.overwrite_vars = false;
}
// reset fields
$scope.group_by_choices = source === 'ec2' ? $scope.ec2_group_by : null;
// azure_rm regions choices are keyed as "azure" in an OPTIONS request to the inventory_sources endpoint
$scope.source_region_choices = source.value === 'azure_rm' ? $scope.azure_regions : $scope[source.value + '_regions'];
$scope.cloudCredentialRequired = source.value !== '' && source.value !== 'custom' && source.value !== 'scm' && source.value !== 'ec2' ? true : false;
$scope.source_region_choices = source === 'azure_rm' ? $scope.azure_regions : $scope[source + '_regions'];
$scope.cloudCredentialRequired = source !== '' && source !== 'scm' && source !== 'custom' && source !== 'ec2' ? true : false;
$scope.group_by = null;
$scope.source_regions = null;
$scope.credential = null;
$scope.credential_name = null;
initRegionSelect();
};