Merge pull request #2293 from stianst/KEYCLOAK-2551

KEYCLOAK-2551
This commit is contained in:
Stian Thorgersen 2016-02-29 14:06:46 +01:00
commit 4286f0560f

View file

@ -1590,8 +1590,8 @@ module.controller('ClientProtocolMapperListCtrl', function($scope, realm, client
}); });
module.controller('ClientProtocolMapperCtrl', function($scope, realm, serverInfo, client, mapper, ClientProtocolMapper, Notifications, Dialog, $location) { module.controller('ClientProtocolMapperCtrl', function($scope, realm, serverInfo, client, mapper, ClientProtocolMapper, Notifications, Dialog, $location) {
/*
$scope.realm = realm; $scope.realm = realm;
/*
$scope.client = client; $scope.client = client;
$scope.create = false; $scope.create = false;
$scope.protocol = client.protocol; $scope.protocol = client.protocol;
@ -1665,12 +1665,13 @@ module.controller('ClientProtocolMapperCtrl', function($scope, realm, serverInfo
}); });
module.controller('ClientProtocolMapperCreateCtrl', function($scope, realm, serverInfo, client, ClientProtocolMapper, Notifications, Dialog, $location) { module.controller('ClientProtocolMapperCreateCtrl', function($scope, realm, serverInfo, client, ClientProtocolMapper, Notifications, Dialog, $location) {
$scope.realm = realm;
if (client.protocol == null) { if (client.protocol == null) {
client.protocol = 'openid-connect'; client.protocol = 'openid-connect';
} }
var protocol = client.protocol; var protocol = client.protocol;
/* /*
$scope.realm = realm;
$scope.client = client; $scope.client = client;
$scope.create = true; $scope.create = true;
$scope.protocol = protocol; $scope.protocol = protocol;