keycloak-uncached

KEYCLOAK-5144: Supported locales are undefined (#4305) *

7/9/2017 9:49:40 PM

Details

diff --git a/themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js b/themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js
index 67d51ac..77dc9cd 100644
--- a/themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js
+++ b/themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js
@@ -406,11 +406,13 @@ module.controller('RealmThemeCtrl', function($scope, Current, Realm, realm, serv
 
     $scope.supportedLocalesOptions = {
         'multiple' : true,
-        'simple_tags' : true
+        'simple_tags' : true,
+        'tags' : []
     };
-
+    
+    updateSupported();
+    
     function localeForTheme(type, name) {
-        console.log(JSON.stringify(serverInfo));
         name = name || 'base';
         for (var i = 0; i < serverInfo.themes[type].length; i++) {
             if (serverInfo.themes[type][i].name == name) {
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/realm-theme-settings.html b/themes/src/main/resources/theme/base/admin/resources/partials/realm-theme-settings.html
index ab1d1e2..be74a2a 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/realm-theme-settings.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/realm-theme-settings.html
@@ -65,9 +65,7 @@
                 <label class="col-md-2 control-label" for="supportedLocales" class="control-label two-lines">{{:: 'supported-locales' | translate}}</label>
 
                 <div class="col-md-6">
-                    <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>
+                    <input ui-select2="supportedLocalesOptions" id="supportedLocales" ng-model="realm.supportedLocales" data-placeholder="{{:: 'supported-locales.placeholder' | translate}}"/>
                 </div>
             </div>
             <div class="form-group" data-ng-show="realm.internationalizationEnabled">