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

Merge pull request #2779 from mabashian/cloud-credential-filter-wiped

Browse Source 
Fix group add/edit cloud credential search filter weird behavior
This commit is contained in:
Michael Abashian 2016-07-05 13:55:37 -04:00 committed by GitHub
commit 60a407b3ef
2 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,21 +93,13 @@
input_type: "radio"
});
}
else if (source === 'ec2'){
LookUpInit({
scope: $scope,
url: GetBasePath('credentials') + '?kind=aws',
form: form,
list: CredentialList,
field: 'credential',
input_type: "radio"
});
}
// equal to case 'rax' || 'azure' || 'azure_rm' || 'vmware' || 'satellite6' || 'cloudforms' || 'openstack' || 'custom'
// equal to case 'ec2' || 'rax' || 'azure' || 'azure_rm' || 'vmware' || 'satellite6' || 'cloudforms' || 'openstack'
else{
var credentialBasePath = (source === 'ec2') ? GetBasePath('credentials') + '?kind=aws' : GetBasePath('credentials') + (source === '' ? '' : '?kind=' + (source));
CredentialList.basePath = credentialBasePath;
LookUpInit({
scope: $scope,
url: GetBasePath('credentials') + (source === '' ? '' : '?kind=' + source),
url: credentialBasePath,
form: form,
list: CredentialList,
field: 'credential',

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

@ -92,20 +92,12 @@
input_type: "radio"
});
}
else if (source.value === 'ec2'){
LookUpInit({
scope: $scope,
url: GetBasePath('credentials') + '?kind=aws',
form: form,
list: CredentialList,
field: 'credential',
input_type: "radio"
});
}
else{
var credentialBasePath = (source.value === 'ec2') ? GetBasePath('credentials') + '?kind=aws' : GetBasePath('credentials') + (source.value === '' ? '' : '?kind=' + (source.value));
CredentialList.basePath = credentialBasePath;
LookUpInit({
scope: $scope,
url: GetBasePath('credentials') + (source.value === '' ? '' : '?kind=' + (source.value)),
url: credentialBasePath,
form: form,
list: CredentialList,
field: 'credential',
@ -260,27 +252,19 @@
$scope = angular.extend($scope, groupData);
// instantiate lookup fields
if (inventorySourceData.source !== 'custom' && inventorySourceData.source !== 'ec2'){
if (inventorySourceData.source !== 'custom'){
var credentialBasePath = (inventorySourceData.source === 'ec2') ? GetBasePath('credentials') + '?kind=aws' : GetBasePath('credentials') + (inventorySourceData.source === '' ? '' : '?kind=' + (inventorySourceData.source));
CredentialList.basePath = credentialBasePath;
LookUpInit({
scope: $scope,
url: GetBasePath('credentials') + (inventorySourceData.source === '' ? '' : '?kind=' + (inventorySourceData.source)),
url: credentialBasePath,
form: form,
list: CredentialList,
field: 'credential',
input_type: "radio"
});
}
else if (inventorySourceData.source === 'ec2'){
LookUpInit({
scope: $scope,
url: GetBasePath('credentials') + '?kind=aws',
form: form,
list: CredentialList,
field: 'credential',
input_type: "radio"
});
}
// equal to case 'rax' || 'azure' || 'azure_rm' || 'vmware' || 'satellite6' || 'cloudforms' || 'openstack' || 'custom'
// equal to case 'custom'
else{
$scope.inventory_script_name = inventorySourceData.summary_fields.source_script.name;
LookUpInit({