From f5ba29ba463c49b5e0b150c526a6cd42cf5823bf Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Wed, 2 Nov 2016 19:45:20 -0400 Subject: [PATCH] Enables cloud credential lookup modal --- awx/ui/client/src/forms/Groups.js | 1 + .../inventories/manage/groups/groups-add.controller.js | 2 +- .../manage/groups/groups-edit.controller.js | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js index ea6efacb7a..9f9828a10f 100644 --- a/awx/ui/client/src/forms/Groups.js +++ b/awx/ui/client/src/forms/Groups.js @@ -76,6 +76,7 @@ export default ngShow: "source && source.value !== '' && source.value !== 'custom'", sourceModel: 'credential', sourceField: 'name', + ngClick: 'lookupCredential()', awRequiredWhen: { reqExpression: "cloudCredentialRequired", init: "false" diff --git a/awx/ui/client/src/inventories/manage/groups/groups-add.controller.js b/awx/ui/client/src/inventories/manage/groups/groups-add.controller.js index 2cea262a67..97da922561 100644 --- a/awx/ui/client/src/inventories/manage/groups/groups-add.controller.js +++ b/awx/ui/client/src/inventories/manage/groups/groups-add.controller.js @@ -31,7 +31,7 @@ export default ['$state', '$stateParams', '$scope', 'GroupForm', 'CredentialList } $scope.lookupCredential = function(){ - $state.go('.lookup.credential', { + $state.go('.credential', { credential_search: { kind: $scope.source.value, page_size: '5', diff --git a/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js b/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js index 0f4da392f0..796dee5066 100644 --- a/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js +++ b/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js @@ -57,6 +57,16 @@ export default ['$state', '$stateParams', '$scope', 'ToggleNotification', 'Parse }); }; + $scope.lookupCredential = function(){ + $state.go('.credential', { + credential_search: { + kind: $scope.source.value, + page_size: '5', + page: '1' + } + }); + }; + $scope.formCancel = function() { $state.go('^'); };