per-realm admin

This commit is contained in:
Bill Burke committed 2014-05-12 10:12:31 -04:00
1 parent 1194e40ef2
commit 1e1991e285
18 files changed
+217 -77

No files matched your search

@@ -73,7 +73,7 @@ public class ModelExporter {
this.propertiesManager.setBasicPropertiesFromModel(realmModel, entity);
// Export 'advanced' properties
ApplicationModel realmAdminApp = realmModel.getAdminApp();
ApplicationModel realmAdminApp = realmModel.getMasterAdminApp();
if (realmAdminApp != null) {
entity.setAdminAppId(realmAdminApp.getId());
}
@@ -182,7 +182,7 @@ public class ModelImporter {
// admin app
String adminAppId = realmEntity.getAdminAppId();
if (adminAppId != null) {
realm.setAdminApp(adminRealm.getApplicationById(adminAppId));
realm.setMasterAdminApp(adminRealm.getApplicationById(adminAppId));
}
// Default roles