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

Merge pull request #7158 from mabashian/7134-6351

Browse Source 
Fix scm inv source credential lookup
This commit is contained in:
Michael Abashian
2017-07-20 10:35:48 -04:00
committed by GitHub
parent cde950dce7 7d39f86d84
commit f3ba635ba2
4 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,14 +71,25 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition',
} }
$scope.lookupCredential = function(){ $scope.lookupCredential = function(){
let kind = ($scope.source.value === "ec2") ? "aws" : $scope.source.value; if($scope.source.value !== "scm" && $scope.source.value !== "custom") {
$state.go('.credential', { let kind = ($scope.source.value === "ec2") ? "aws" : $scope.source.value;
credential_search: { $state.go('.credential', {
kind: kind, credential_search: {
page_size: '5', kind: kind,
page: '1' page_size: '5',
} page: '1'
}); }
});
}
else {
$state.go('.credential', {
credential_search: {
credential_type__kind: "cloud",
page_size: '5',
page: '1'
}
});
}
}; };
$scope.lookupProject = function(){ $scope.lookupProject = function(){

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

@@ -300,14 +300,25 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString',
}; };
$scope.lookupCredential = function(){ $scope.lookupCredential = function(){
let kind = ($scope.source.value === "ec2") ? "aws" : $scope.source.value; if($scope.source.value !== "scm" && $scope.source.value !== "custom") {
$state.go('.credential', { let kind = ($scope.source.value === "ec2") ? "aws" : $scope.source.value;
credential_search: { $state.go('.credential', {
kind: kind, credential_search: {
page_size: '5', kind: kind,
page: '1' page_size: '5',
} page: '1'
}); }
});
}
else {
$state.go('.credential', {
credential_search: {
credential_type__kind: "cloud",
page_size: '5',
page: '1'
}
});
}
}; };
$scope.formCancel = function() { $scope.formCancel = function() {

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

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

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

@@ -71,7 +71,7 @@ return {
type: 'lookup', type: 'lookup',
list: 'CredentialList', list: 'CredentialList',
basePath: 'credentials', basePath: 'credentials',
ngShow: "source && source.value !== '' && source.value !== 'custom'", ngShow: "source && source.value !== ''",
sourceModel: 'credential', sourceModel: 'credential',
sourceField: 'name', sourceField: 'name',
ngClick: 'lookupCredential()', ngClick: 'lookupCredential()',