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

Fix empty dropdowns for both LDAP and TACACS tabs.

Browse Source
This commit is contained in:
kialam
2018-11-14 18:35:47 -05:00
parent 9b992c971e
commit ea35d9713a
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/client/src/configuration/forms/auth-form/configuration-auth.controller.js
View File

@@ -29,7 +29,7 @@ export default [
authVm.activeAuthForm = 'azure'; authVm.activeAuthForm = 'azure';
authVm.activeTab = 'azure'; authVm.activeTab = 'azure';
authVm.ldapDropdownValue = ''; authVm.ldapDropdownValue = 'ldap';
authVm.githubDropdownValue = 'github'; authVm.githubDropdownValue = 'github';
let codeInputInitialized = false; let codeInputInitialized = false;
@@ -199,7 +199,6 @@ export default [
name: 'ldap5' name: 'ldap5'
}, },
]; ];
var forms = _.map(authForms, 'formDef'); var forms = _.map(authForms, 'formDef');
_.each(forms, function(form) { _.each(forms, function(form) {
var keys = _.keys(form.fields); var keys = _.keys(form.fields);
@@ -207,9 +206,9 @@ export default [
if($scope.configDataResolve[key].type === 'choice') { if($scope.configDataResolve[key].type === 'choice') {
// Create options for dropdowns // Create options for dropdowns
var optionsGroup = key + '_options'; var optionsGroup = key + '_options';
$scope.$parent[optionsGroup] = []; $scope.$parent.$parent[optionsGroup] = [];
_.each($scope.configDataResolve[key].choices, function(choice){ _.each($scope.configDataResolve[key].choices, function(choice){
$scope.$parent[optionsGroup].push({ $scope.$parent.$parent[optionsGroup].push({
name: choice[0], name: choice[0],
label: choice[1], label: choice[1],
value: choice[0] value: choice[0]
@@ -303,7 +302,7 @@ export default [
} }
if($scope.$parent[groupPropName] !== null) { if($scope.$parent[groupPropName] !== null) {
$scope.$parent[groupPropName] = _.find($scope[groupOptionsPropName], { value: $scope.$parent[groupPropName] }); $scope.$parent.$parent[groupPropName] = _.find($scope[groupOptionsPropName], { value: $scope.$parent[groupPropName] });
} }
if(flag !== undefined){ if(flag !== undefined){
@@ -322,7 +321,7 @@ export default [
function populateTacacsProtocol(flag){ function populateTacacsProtocol(flag){
if($scope.$parent.TACACSPLUS_AUTH_PROTOCOL !== null) { if($scope.$parent.TACACSPLUS_AUTH_PROTOCOL !== null) {
$scope.$parent.TACACSPLUS_AUTH_PROTOCOL = _.find($scope.$parent.TACACSPLUS_AUTH_PROTOCOL_options, { value: $scope.$parent.TACACSPLUS_AUTH_PROTOCOL }); $scope.$parent.$parent.TACACSPLUS_AUTH_PROTOCOL = _.find($scope.$parent.TACACSPLUS_AUTH_PROTOCOL_options, { value: $scope.$parent.TACACSPLUS_AUTH_PROTOCOL });
} }
if(flag !== undefined){ if(flag !== undefined){
@@ -384,7 +383,7 @@ export default [
function getActiveAuthForm (tab) { function getActiveAuthForm (tab) {
if (tab === 'ldap') { if (tab === 'ldap') {
return `ldap${authVm.ldapDropdownValue}`; return authVm.ldapDropdownValue;
} else if (tab === 'github') { } else if (tab === 'github') {
return authVm.githubDropdownValue; return authVm.githubDropdownValue;
} }