RW: Fixed "Tried to retrieve a localized string..." warnings (MID-322…

…5) + one more "500" bug.
Evolveum · Jun 30, 2016 · 24e47f2 · 24e47f2
1 parent 4c14c94
commit 24e47f2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
@@ -57,7 +57,7 @@ public class WizardStep extends org.apache.wicket.extensions.wizard.WizardStep {
     public WizardStep(PageBase pageBase) {
         this.pageBase = pageBase;
         String key = getClass().getSimpleName() + ".title";
-        setTitleModel(PageBase.createStringResourceStatic(this, key));
+        setTitleModel(pageBase.createStringResource(key));
     }
 
     @Override

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.java
@@ -99,8 +99,12 @@ private IModel<String> createStringModel(String resourceKey) {
     }
 
     private IModel<String> createXmlEditorModel() {
-        return new AbstractReadOnlyModel<String>() {
-            @Override
+        return new IModel<String>() {
+			@Override
+			public void detach() {
+			}
+
+			@Override
             public String getObject() {
                 PrismObject<ResourceType> resource = model.getObject();
                 PrismContainer xmlSchema = resource.findContainer(ResourceType.F_SCHEMA);
@@ -117,7 +121,12 @@ public String getObject() {
 					return WebComponentUtil.exceptionToString("Couldn't serialize resource schema", ex);
                 }
             }
-        };
+
+			@Override
+			public void setObject(String object) {
+				// ignore (it's interesting that this is called sometimes, even when the ACE is set to be read only)
+			}
+		};
     }
 
     private void reloadPerformed(AjaxRequestTarget target) {

diff --git a/...rc/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java b/...rc/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
@@ -154,7 +154,7 @@ private ResourceSynchronizationDto loadResourceSynchronization() {
 		}
 
 		ResourceSynchronizationDto dto = new ResourceSynchronizationDto(resourceModel.getObject().asObjectable().getSynchronization().getObjectSynchronization());
-        dto.setObjectClassList(loadResourceObjectClassList(resourceModel, LOGGER, getString("SynchronizationStep.message.errorLoadingObjectSyncList")));
+        dto.setObjectClassList(loadResourceObjectClassList(resourceModel, LOGGER, parentPage.getString("SynchronizationStep.message.errorLoadingObjectSyncList")));
         return dto;
     }