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

AC-614 credential lookup now narrows choices based on specific source. So if source is 'ec2' only show 'aws' credentials.

Browse Source
This commit is contained in:
Chris Houseknecht
2013-11-08 18:40:26 +00:00
parent 1d27f666e4
commit b2ce037acc
1 changed files with 12 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
awx/ui/static/js/helpers/Groups.js
View File

@@ -804,7 +804,8 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
} }
LookUpInit({ LookUpInit({
url: GetBasePath('credentials') + '?cloud=true', url: GetBasePath('credentials') +
'?cloud=true&kind=' + [(scope.source.value == 'rackspace') ? 'rax' : 'aws'],
scope: scope, scope: scope,
form: form, form: form,
list: CredentialList, list: CredentialList,
@@ -987,30 +988,6 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
}; };
scope.sourceChange = function() { scope.sourceChange = function() {
/*if (scope['source'].value == 'ec2' || scope['source'].value == 'rackspace') {
scope.sourcePasswordRequired = true;
scope.sourceUsernameRequired = true;
if (scope['source'].value == 'ec2') {
scope.sourceUsernameLabel = 'Access Key ID';
scope.sourcePasswordLabel = 'Secret Access Key';
scope.sourcePasswordConfirmLabel = 'Confirm Secret Access Key';
}
else {
scope.sourceUsernameLabel = 'Username';
scope.sourcePasswordLabel = 'Password';
scope.sourcePasswordConfirmLabel = 'Confirm Password';
}
}
else {
scope.sourcePasswordRequired = false;
scope.sourceUsernameRequired = false;
// reset fields
scope.source_password = '';
scope.source_password_confirm = '';
scope.source_username = '';
scope[form.name + '_form']['source_username'].$setValidity('required',true);
}*/
if (scope['source'].value == 'file') { if (scope['source'].value == 'file') {
scope.sourcePathRequired = true; scope.sourcePathRequired = true;
} }
@@ -1019,39 +996,19 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
// reset fields // reset fields
scope.source_path = ''; scope.source_path = '';
scope[form.name + '_form']['source_path'].$setValidity('required',true); scope[form.name + '_form']['source_path'].$setValidity('required',true);
scope['credential'] = '';
scope['credential_name'] = '';
} }
LookUpInit({
url: GetBasePath('credentials') +
'?cloud=true&kind=' + [(scope.source.value == 'rackspace') ? 'rax' : 'aws'],
scope: scope,
form: form,
list: CredentialList,
field: 'credential'
});
} }
// Password change
/*scope.clearPWConfirm = function(fld) {
// If password value changes, make sure password_confirm must be re-entered
scope[fld] = '';
scope[form.name + '_form'][fld].$setValidity('awpassmatch', false);
}
// Respond to 'Ask at runtime?' checkbox
scope.ask = function(fld, associated) {
if (scope[fld + '_ask']) {
scope[fld] = 'ASK';
scope[associated] = '';
scope[form.name + '_form'][associated].$setValidity('awpassmatch', true);
}
else {
scope[fld] = '';
scope[associated] = '';
scope[form.name + '_form'][associated].$setValidity('awpassmatch', true);
}
}
// Click clear button
scope.clear = function(fld, associated) {
scope[fld] = '';
scope[associated] = '';
scope[form.name + '_form'][associated].$setValidity('awpassmatch', true);
scope[form.name + '_form'].$setDirty();
}
*/
// Start the update process // Start the update process
scope.updateGroup = function() { scope.updateGroup = function() {
if (scope.source == "" || scope.source == null) { if (scope.source == "" || scope.source == null) {