libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Merge pull request #2051 from stianst/KEYCLOAK-2308

Browse source 
KEYCLOAK-2308
This commit is contained in:
Stian Thorgersen 2016-01-18 20:43:31 +01:00
commit e8336f3dd4
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js
View file

@ -343,8 +343,8 @@ module.controller('RealmThemeCtrl', function($scope, Current, Realm, realm, serv
};
$scope.$watch('realm.supportedLocales', function(oldVal, newVal) {
if(angular.isUndefined(newVal) || (angular.isArray(newVal) && newVal.length == 0)){
$scope.realm.defaultLocale = undefined;
if ($scope.realm.defaultLocale && newVal && newVal.indexOf($scope.realm.defaultLocale) == -1) {
$scope.realm.defaultLocale = null;
}
}, true);
});

4
forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-theme-settings.html
View file

@ -65,7 +65,9 @@
<label class="col-md-2 control-label" for="supportedLocales" class="control-label two-lines">{{:: 'supported-locales' | translate}}</label>
<div class="col-md-6">
<input id="supportedLocales" type="text" ui-select2="supportedLocalesOptions" ng-model="realm.supportedLocales" placeholder="{{:: 'supported-locales.placeholder' | translate}}" ng-required="realm.internationalizationEnabled" ng-disabled="!realm.internationalizationEnabled">
<select ui-select2 id="supportedLocales" ng-model="realm.supportedLocales" data-placeholder="{{:: 'supported-locales.placeholder' | translate}}" ng-required="realm.internationalizationEnabled" multiple>
<option ng-repeat="option in supportedLocalesOptions.tags" value="{{option}}">{{option}}</option>
</select>
</div>
</div>
<div class="form-group" data-ng-show="realm.internationalizationEnabled">