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

Merge pull request #6848 from mabashian/6825-aws-credential-select

Browse Source 
Fixed credential kind lookup on inventory source
This commit is contained in:
Michael Abashian
2017-07-01 22:09:05 -04:00
committed by GitHub
parent a03d368e85 776fae3c35
commit 7f5a45f2fe
4 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,10 +99,10 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition',
} }
$scope.lookupCredential = function(){ $scope.lookupCredential = function(){
let kind = ($scope.source.value === "ec2") ? "aws" : $scope.source.value;
$state.go('.credential', { $state.go('.credential', {
credential_search: { credential_search: {
// TODO: get kind sorting for credential properly implemented kind: kind,
// kind: kind,
page_size: '5', page_size: '5',
page: '1' page: '1'
} }

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

@@ -274,17 +274,6 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString',
}); });
} }
$scope.lookupCredential = function(){
$state.go('.credential', {
credential_search: {
// TODO: get kind sorting for credential properly implemented
// kind: kind,
page_size: '5',
page: '1'
}
});
};
$scope.lookupProject = function(){ $scope.lookupProject = function(){
$state.go('.project', { $state.go('.project', {
project_search: { project_search: {

1
awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-credential.route.js
View File

@@ -5,6 +5,7 @@ export default {
page_size:"5", page_size:"5",
order_by:"name", order_by:"name",
role_level:"use_role", role_level:"use_role",
kind: null
}, },
dynamic:true, dynamic:true,
squash:"" squash:""

2
awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js
View File

@@ -123,8 +123,6 @@ return {
ngOptions: 'source.label for source in source_region_choices track by source.value', ngOptions: 'source.label for source in source_region_choices track by source.value',
multiSelect: true, multiSelect: true,
ngShow: "source && (source.value == 'rax' || source.value == 'ec2' || source.value == 'gce' || source.value == 'azure' || source.value == 'azure_rm')", ngShow: "source && (source.value == 'rax' || source.value == 'ec2' || source.value == 'gce' || source.value == 'azure' || source.value == 'azure_rm')",
dataTitle: 'Source Regions', dataTitle: 'Source Regions',
dataPlacement: 'right', dataPlacement: 'right',
awPopOver: "<p>Click on the regions field to see a list of regions for your cloud provider. You can select multiple regions, " + awPopOver: "<p>Click on the regions field to see a list of regions for your cloud provider. You can select multiple regions, " +