External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 03:31:10 -03:30
Code Issues Packages Projects Releases Wiki Activity

fix azure regions multiselect, resolves #2289 (#2330)

Browse Source
This commit is contained in:
Leigh
2016-06-14 11:18:39 -04:00
committed by GitHub
parent 387a487325
commit 3c887768c1
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/inventories/manage/groups/groups-add.controller.js
View File

@@ -116,7 +116,8 @@
}
// reset fields
$scope.group_by_choices = source === 'ec2' ? $scope.ec2_group_by : null;
$scope.source_region_choices = $scope[source + '_regions'];
// azure_rm regions choices are keyed as "azure" in an OPTIONS request to the inventory_sources endpoint
$scope.source_region_choices = source === 'azure_rm' ? $scope.azure_regions : $scope[source + '_regions'];
$scope.cloudCredentialRequired = source !== 'manual' && source !== 'custom' ? true : false;
$scope.group_by = null;
$scope.source_regions = null;

16
awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
View File

@@ -113,8 +113,9 @@
});
}
// reset fields
$scope.source_region_choices = $scope[source + '_regions'];
$scope.cloudCredentialRequired = source !== 'manual' && source !== 'custom' ? true : false;
// 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 !== 'manual' && source.value !== 'custom' ? true : false;
$scope.group_by = null;
$scope.source_regions = null;
$scope.credential = null;
@@ -141,8 +142,17 @@
var initRegionData = function(){
var source = $scope.source.value === 'azure_rm' ? 'azure' : $scope.source.value;
var regions = inventorySourceData.source_regions.split(',');
// azure_rm regions choices are keyed as "azure" in an OPTIONS request to the inventory_sources endpoint
$scope.source_region_choices = $scope[source + '_regions'];
$scope.source_regions = _.map(regions, (region) => _.find($scope[source+'_regions'], {value: region}));
// the API stores azure regions as all-lowercase strings - but the azure regions received from OPTIONS are Snake_Cased
if (source === 'azure'){
$scope.source_regions = _.map(regions, (region) => _.find($scope[source+'_regions'], (o) => o.value.toLowerCase() === region));
}
// all other regions are 1-1
else{
$scope.source_regions = _.map(regions, (region) => _.find($scope[source+'_regions'], (o) => o.value === region));
}
$scope.group_by_choices = source === 'ec2' ? $scope.ec2_group_by : null;
if (source ==='ec2'){
var group_by = inventorySourceData.group_by.split(',');