Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bill Burke 2016-08-18 13:13:28 -04:00
commit 561661d726

View file

@ -596,6 +596,9 @@ module.controller('UserFederationCtrl', function($scope, $location, $route, real
console.log('UserFederationCtrl ++++****'); console.log('UserFederationCtrl ++++****');
$scope.realm = realm; $scope.realm = realm;
$scope.providers = serverInfo.componentTypes['org.keycloak.storage.UserStorageProvider']; $scope.providers = serverInfo.componentTypes['org.keycloak.storage.UserStorageProvider'];
if (!$scope.providers) $scope.providers = [];
for (var i = 0; i < $scope.providers.length; i++) { for (var i = 0; i < $scope.providers.length; i++) {
$scope.providers[i].isUserFederationProvider = false; $scope.providers[i].isUserFederationProvider = false;
} }