Merge pull request #69 from ammendonca/KEYCLOAK-95

KEYCLOAK-95: social attribute was not being copied to $scope.realm, so r...
This commit is contained in:
Bill Burke 2013-10-15 06:50:46 -07:00
commit 26156df8f8

View file

@ -155,7 +155,7 @@ module.controller('RealmRequiredCredentialsCtrl', function($scope, Realm, realm,
console.log('RealmRequiredCredentialsCtrl'); console.log('RealmRequiredCredentialsCtrl');
$scope.realm = { $scope.realm = {
id : realm.id, realm : realm.realm, id : realm.id, realm : realm.realm, social : realm.social,
requiredCredentials : realm.requiredCredentials, requiredCredentials : realm.requiredCredentials,
requiredApplicationCredentials : realm.requiredApplicationCredentials, requiredApplicationCredentials : realm.requiredApplicationCredentials,
requiredOAuthClientCredentials : realm.requiredOAuthClientCredentials requiredOAuthClientCredentials : realm.requiredOAuthClientCredentials
@ -200,7 +200,7 @@ module.controller('RealmRequiredCredentialsCtrl', function($scope, Realm, realm,
module.controller('RealmTokenDetailCtrl', function($scope, Realm, realm, $http, $location, Dialog, Notifications) { module.controller('RealmTokenDetailCtrl', function($scope, Realm, realm, $http, $location, Dialog, Notifications) {
console.log('RealmTokenDetailCtrl'); console.log('RealmTokenDetailCtrl');
$scope.realm = { id : realm.id, realm : realm.realm, tokenLifespan : realm.tokenLifespan, accessCodeLifespan : realm.accessCodeLifespan }; $scope.realm = { id : realm.id, realm : realm.realm, social : realm.social, tokenLifespan : realm.tokenLifespan, accessCodeLifespan : realm.accessCodeLifespan };
$scope.realm.tokenLifespanUnit = 'Seconds'; $scope.realm.tokenLifespanUnit = 'Seconds';
$scope.realm.accessCodeLifespanUnit = 'Seconds'; $scope.realm.accessCodeLifespanUnit = 'Seconds';