shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00
Code Releases Activity

Limit adhoc credential lookup to only machine credentials

Browse Source
This commit is contained in:
mabashian 2018-04-09 17:10:15 -04:00
parent 150467a1cb
commit 6e2133aa52
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js
View File

@ -7,7 +7,8 @@ export default {
params: { params: {
credential_search: { credential_search: {
value: { value: {
page_size: '5' page_size: '5',
credential_type: null
}, },
squash: true, squash: true,
dynamic: true dynamic: true

16
awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.controller.js
View File

@ -12,7 +12,7 @@
function adhocController($q, $scope, $stateParams, function adhocController($q, $scope, $stateParams,
$state, CheckPasswords, PromptForPasswords, CreateLaunchDialog, CreateSelect2, adhocForm, $state, CheckPasswords, PromptForPasswords, CreateLaunchDialog, CreateSelect2, adhocForm,
GenerateForm, Rest, ProcessErrors, GetBasePath, GetChoices, GenerateForm, Rest, ProcessErrors, GetBasePath, GetChoices,
KindChange, Wait, ParseTypeChange) { KindChange, Wait, ParseTypeChange, credentialTypes) {
// this is done so that we can access private functions for testing, but // this is done so that we can access private functions for testing, but
// we don't want to populate the "public" scope with these internal // we don't want to populate the "public" scope with these internal
@ -301,11 +301,23 @@ function adhocController($q, $scope, $stateParams,
}); });
}; };
$scope.lookupCredential = function(){
let credType = _.filter(credentialTypes, function(credType){
return credType.kind === "ssh";
});
$state.go('.credential', {
credential_search: {
credential_type: credType[0].id,
page_size: '5',
page: '1'
}
});
};
} }
export default ['$q', '$scope', '$stateParams', export default ['$q', '$scope', '$stateParams',
'$state', 'CheckPasswords', 'PromptForPasswords', 'CreateLaunchDialog', 'CreateSelect2', '$state', 'CheckPasswords', 'PromptForPasswords', 'CreateLaunchDialog', 'CreateSelect2',
'adhocForm', 'GenerateForm', 'Rest', 'ProcessErrors', 'GetBasePath', 'adhocForm', 'GenerateForm', 'Rest', 'ProcessErrors', 'GetBasePath',
'GetChoices', 'KindChange', 'Wait', 'ParseTypeChange', 'GetChoices', 'KindChange', 'Wait', 'ParseTypeChange', 'credentialTypes',
adhocController]; adhocController];

1
awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.form.js
View File

@ -64,6 +64,7 @@ export default ['i18n', function(i18n) {
sourceModel: 'credential', sourceModel: 'credential',
sourceField: 'name', sourceField: 'name',
class: 'squeeze', class: 'squeeze',
ngClick: 'lookupCredential()',
awPopOver: '<p>Select the credential you want to use when ' + awPopOver: '<p>Select the credential you want to use when ' +
'accessing the remote hosts to run the command. ' + 'accessing the remote hosts to run the command. ' +
'Choose the credential containing ' + 'Choose the credential containing ' +

9
awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.route.js
View File

@ -26,5 +26,14 @@ export default {
}, },
ncyBreadcrumb: { ncyBreadcrumb: {
label: N_("RUN COMMAND") label: N_("RUN COMMAND")
},
resolve: {
credentialTypes: ['CredentialTypeModel', (CredentialType) =>
new CredentialType('get')
.then((model) => {
const credentialTypeRes = model.get();
return credentialTypeRes.results;
})
]
} }
}; };