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

Merge pull request #4608 from jaredevantabor/cloud-credential-lookup

Browse Source 
fixing the lookup modal for the group form's credential lookup
This commit is contained in:
Jared Tabor
2017-01-09 09:59:32 -08:00
committed by GitHub
parent ae463b2130 43a04e6ada
commit 9f01338c17
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/src/forms/Groups.js
View File

@@ -69,6 +69,11 @@ export default
ngModel: 'source' ngModel: 'source'
}, },
credential: { credential: {
// initializes a default value for this search param
// search params with default values set will not generate user-interactable search tags
search: {
kind: null
},
label: 'Cloud Credential', label: 'Cloud Credential',
type: 'lookup', type: 'lookup',
list: 'CredentialList', list: 'CredentialList',

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

@@ -31,9 +31,10 @@ export default ['$state', '$stateParams', '$scope', 'GroupForm', 'CredentialList
} }
$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: {
kind: $scope.source.value, kind: kind,
page_size: '5', page_size: '5',
page: '1' page: '1'
} }

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

@@ -58,9 +58,10 @@ export default ['$state', '$stateParams', '$scope', 'ToggleNotification', 'Parse
}; };
$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: {
kind: $scope.source.value, kind: kind,
page_size: '5', page_size: '5',
page: '1' page: '1'
} }