From 86ae3082a43b034ec0e2854b5e40920ad2547eac Mon Sep 17 00:00:00 2001 From: jaredevantabor Date: Tue, 25 Apr 2017 10:37:45 -0700 Subject: [PATCH] removing UI parsing for LDAP User and Group Search fields the UI parsing was formatting the user input in a way that makes the API angry --- .../configuration/configuration.controller.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/src/configuration/configuration.controller.js b/awx/ui/client/src/configuration/configuration.controller.js index cc477d353b..5cfdf1763d 100644 --- a/awx/ui/client/src/configuration/configuration.controller.js +++ b/awx/ui/client/src/configuration/configuration.controller.js @@ -75,7 +75,10 @@ export default [ if(key === "AD_HOC_COMMANDS"){ $scope[key] = data[key].toString(); } - else{ + else if(key === "AUTH_LDAP_USER_SEARCH" || key === "AUTH_LDAP_GROUP_SEARCH"){ + $scope[key] = data[key]; + } + else { $scope[key] = ConfigurationUtils.arrayToList(data[key], key); } @@ -375,8 +378,15 @@ export default [ payload[key] = $scope[key].value; } } else if($scope.configDataResolve[key].type === 'list' && $scope[key] !== null) { - // Parse lists - payload[key] = ConfigurationUtils.listToArray($scope[key], key); + + if(key === "AUTH_LDAP_USER_SEARCH" || key === "AUTH_LDAP_GROUP_SEARCH"){ + payload[key] = $scope[key]; + } + else { + // Parse lists + payload[key] = ConfigurationUtils.listToArray($scope[key], key); + } + } else if($scope.configDataResolve[key].type === 'nested object') { if($scope[key] === '') {