keycloak-uncached

KEYCLOAK-115 fixing message headers

10/25/2013 11:21:58 AM

Details

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/index.html b/admin-ui/src/main/resources/META-INF/resources/admin/index.html
index 650aeb7..b953e92 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/index.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/index.html
@@ -65,7 +65,7 @@
 
 
 <div class="feedback-aligner" data-ng-show="notification" data-ng-click="notification = null">
-    <div class="alert alert-{{notification.type}}"><strong>Success!</strong> {{notification.message}}</div>
+    <div class="alert alert-{{notification.type}}"><strong>{{notification.header}}</strong> {{notification.message}}</div>
 </div>
 
 <div id="wrap">
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js
index b5d900f..6907b80 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js
@@ -55,9 +55,10 @@ module.factory('Notifications', function($rootScope, $timeout) {
 		$rootScope.notifications = [];
 	}
 
-	notifications.message = function(type, message) {
+	notifications.message = function(type, header, message) {
 		$rootScope.notification = {
 			type : type,
+			header: header,
 			message : message
 		};
 
@@ -65,19 +66,19 @@ module.factory('Notifications', function($rootScope, $timeout) {
 	}
 
 	notifications.info = function(message) {
-		notifications.message("info", message);
+		notifications.message("info", "Info!", message);
 	};
 
 	notifications.success = function(message) {
-		notifications.message("success", message);
+		notifications.message("success", "Success!", message);
 	};
 
 	notifications.error = function(message) {
-		notifications.message("error", message);
+		notifications.message("error", "Error!", message);
 	};
 
 	notifications.warn = function(message) {
-		notifications.message("warn", message);
+		notifications.message("warn", "Warning!", message);
 	};
 
 	return notifications;
diff --git a/services/src/main/java/org/keycloak/services/managers/RealmManager.java b/services/src/main/java/org/keycloak/services/managers/RealmManager.java
index d0f3e95..1387f12 100755
--- a/services/src/main/java/org/keycloak/services/managers/RealmManager.java
+++ b/services/src/main/java/org/keycloak/services/managers/RealmManager.java
@@ -253,7 +253,7 @@ public class RealmManager {
             }
         }
 
-        if (rep.isAccountManagement() != null && rep.isAccountManagement()) {
+        if (rep.getAccountManagement() != null && rep.getAccountManagement()) {
             enableAccountManagement(newRealm);
         }