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

Merge pull request #6100 from jaredevantabor/ldap-user-group-search

Browse Source 
removing UI parsing for LDAP User and Group Search fields
This commit is contained in:
Jared Tabor
2017-04-25 10:55:15 -07:00
committed by GitHub
parent 293648590a 86ae3082a4
commit 76e21e3d38
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/client/src/configuration/configuration.controller.js
View File

@@ -75,6 +75,9 @@ export default [
if(key === "AD_HOC_COMMANDS"){ if(key === "AD_HOC_COMMANDS"){
$scope[key] = data[key].toString(); $scope[key] = data[key].toString();
} }
else if(key === "AUTH_LDAP_USER_SEARCH" || key === "AUTH_LDAP_GROUP_SEARCH"){
$scope[key] = data[key];
}
else { else {
$scope[key] = ConfigurationUtils.arrayToList(data[key], key); $scope[key] = ConfigurationUtils.arrayToList(data[key], key);
} }
@@ -375,9 +378,16 @@ export default [
payload[key] = $scope[key].value; payload[key] = $scope[key].value;
} }
} else if($scope.configDataResolve[key].type === 'list' && $scope[key] !== null) { } else if($scope.configDataResolve[key].type === 'list' && $scope[key] !== null) {
if(key === "AUTH_LDAP_USER_SEARCH" || key === "AUTH_LDAP_GROUP_SEARCH"){
payload[key] = $scope[key];
}
else {
// Parse lists // Parse lists
payload[key] = ConfigurationUtils.listToArray($scope[key], key); payload[key] = ConfigurationUtils.listToArray($scope[key], key);
} }
}
else if($scope.configDataResolve[key].type === 'nested object') { else if($scope.configDataResolve[key].type === 'nested object') {
if($scope[key] === '') { if($scope[key] === '') {
payload[key] = {}; payload[key] = {};