(hopefully) fixing MID-3159: RW sometimes crashes with a problem with…

… editing a null value
Evolveum · Jun 16, 2016 · 7df642a · 7df642a
1 parent 18a0e2d
commit 7df642a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardButtonBar.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardButtonBar.java
@@ -139,6 +139,7 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
 				IWizardStep activeStep = wizard.getModelObject().getActiveStep();
 				if (activeStep != null) {
 					activeStep.applyState();
+					target.add(getPage());
 				}
 			}
 

diff --git a/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java b/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
@@ -911,7 +911,7 @@ private boolean isSelected(@NotNull ResourceObjectTypeDefinitionTypeDto objectTy
 
 	private void addObjectTypePerformed(AjaxRequestTarget target) {
         ResourceObjectTypeDefinitionType objectType = new ResourceObjectTypeDefinitionType();
-        objectType.setDisplayName(generateName(getString("SchemaHandlingStep.label.newObjectType")));
+        //objectType.setDisplayName(generateName(getString("SchemaHandlingStep.label.newObjectType")));
         ResourceObjectTypeDefinitionTypeDto dto = new ResourceObjectTypeDefinitionTypeDto(objectType);
 
         if (schemaHandlingDtoModel.getObject().getObjectTypeDtoList().isEmpty()) {

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
@@ -573,7 +573,7 @@ public String getObject() {
                 StringBuilder sb = new StringBuilder();
 
                 if (syncObject != null) {
-                    sb.append(syncObject.getName() != null ? syncObject.getName() : "(name not specified) ");
+                    sb.append(syncObject.getName() != null ? syncObject.getName() : "-");
 					SchemaHandlingStep.addKindAndIntent(sb, syncObject.getKind(), syncObject.getIntent());
                 }
 
@@ -786,7 +786,7 @@ private boolean isSelected(ObjectSynchronizationType syncObject) {
 	private void addSyncObjectPerformed(AjaxRequestTarget target){
         ObjectSynchronizationType syncObject = new ObjectSynchronizationType();
 		syncObject.setEnabled(true);
-        syncObject.setName(generateName(getString("SynchronizationStep.label.newObjectType")));
+        //syncObject.setName(generateName(getString("SynchronizationStep.label.newObjectType")));
 
         resourceModel.getObject().asObjectable().getSynchronization().getObjectSynchronization().add(syncObject);
 		editSyncObjectPerformed(target, syncObject);