keycloak-memoizeit

Merge pull request #2533 from stianst/KEYCLOAK-2762-1.9 KEYCLOAK-2762

4/7/2016 4:34:38 AM

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 66bce8c..8bac7bf 100755
--- 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
@@ -203,6 +203,7 @@ module.controller('ObjectModalCtrl', function($scope, object) {
 module.controller('RealmDetailCtrl', function($scope, Current, Realm, realm, serverInfo, $http, $location, Dialog, Notifications, Auth) {
     $scope.createRealm = !realm.realm;
     $scope.serverInfo = serverInfo;
+    $scope.realmName = realm.realm;
 
     if (Current.realm == null || Current.realm.realm != realm.realm) {
         for (var i = 0; i < Current.realms.length; i++) {
@@ -228,11 +229,17 @@ module.controller('RealmDetailCtrl', function($scope, Current, Realm, realm, ser
             $scope.changed = true;
         }
     }, true);
+    $scope.$watch('realmName', function() {
+        if (!angular.equals($scope.realmName, oldCopy.realm)) {
+            $scope.changed = true;
+        }
+    }, true);
 
     $scope.save = function() {
         var realmCopy = angular.copy($scope.realm);
+        realmCopy.realm = $scope.realmName;
         $scope.changed = false;
-        var nameChanged = !angular.equals($scope.realm.realm, oldCopy.realm)
+        var nameChanged = !angular.equals($scope.realmName, oldCopy.realm);
         Realm.update({ id : oldCopy.realm}, realmCopy, function () {
             var data = Realm.query(function () {
                 Current.realms = data;
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/realm-detail.html b/themes/src/main/resources/theme/base/admin/resources/partials/realm-detail.html
index 19561ea..6a694f1 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/realm-detail.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/realm-detail.html
@@ -5,7 +5,7 @@
             <div class="form-group">
                 <label class="col-md-2 control-label" for="name"><span class="required">*</span> {{:: 'name' | translate}}</label>
                 <div class="col-md-6">
-                    <input class="form-control" type="text" id="name" name="name" data-ng-model="realm.realm" autofocus required>
+                    <input class="form-control" type="text" id="name" name="name" data-ng-model="realmName" autofocus required>
                 </div>
             </div>