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

Fix LDAP_GROUP_TYPE_PARAMS revert value

Browse Source
This commit is contained in:
Marliana Lara
2018-03-29 13:33:17 -04:00
parent 25c8bf93ec
commit 471248e66c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -338,7 +338,6 @@ export default [
Wait('start'); Wait('start');
var payload = {}; var payload = {};
payload[key] = $scope.configDataResolve[key].default; payload[key] = $scope.configDataResolve[key].default;
ConfigurationService.patchConfiguration(payload) ConfigurationService.patchConfiguration(payload)
.then(function() { .then(function() {
$scope[key] = $scope.configDataResolve[key].default; $scope[key] = $scope.configDataResolve[key].default;
@@ -361,10 +360,13 @@ export default [
else if($scope[key + '_field'].hasOwnProperty('codeMirror')){ else if($scope[key + '_field'].hasOwnProperty('codeMirror')){
const isLdap = (key.indexOf("AUTH_LDAP") !== -1); const isLdap = (key.indexOf("AUTH_LDAP") !== -1);
const isLdapGroupTypeParams = isLdap && (key.indexOf("GROUP_TYPE_PARAMS") !== -1);
const isLdapUserSearch = isLdap && (key.indexOf("USER_SEARCH") !== -1); const isLdapUserSearch = isLdap && (key.indexOf("USER_SEARCH") !== -1);
const isLdapGroupSearch = isLdap && (key.indexOf("GROUP_SEARCH") !== -1); const isLdapGroupSearch = isLdap && (key.indexOf("GROUP_SEARCH") !== -1);
if (isLdapUserSearch || isLdapGroupSearch) { if (isLdapGroupTypeParams) {
$scope[key] = JSON.stringify($scope.configDataResolve[key].default);
} else if (isLdapUserSearch || isLdapGroupSearch) {
$scope[key] = '[]'; $scope[key] = '[]';
} else { } else {
$scope[key] = '{}'; $scope[key] = '{}';
@@ -456,7 +458,6 @@ export default [
} }
} }
}); });
return payload; return payload;
}; };