another fixes for MID-5479 (including fix for polystring panel)

Evolveum · Jul 3, 2019 · 4f4af16 · 4f4af16
1 parent 406d71c
commit 4f4af16
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismValueWrapperImpl.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismValueWrapperImpl.java
@@ -63,17 +63,20 @@ public <D extends ItemDelta<V, ID>, ID extends ItemDefinition> void addToDelta(D
 				if (!isChanged()) {
 					break;
 				}
-			case MODIFIED:				
+			case MODIFIED:
+
 				if (parent.isSingleValue()) {
 					if (newValue.isEmpty())  {
-						delta.addValueToReplace(null);
+						delta.addValueToDelete((V) oldValue.clone());
 					} else {
 						delta.addValueToReplace((V) newValue.clone());
 					}
 					break;
 				}
-
-				delta.addValueToAdd((V) newValue.clone());
+
+				if (!newValue.isEmpty()) {
+					delta.addValueToAdd((V) newValue.clone());
+				}
 				if (!oldValue.isEmpty()) {
 					delta.addValueToDelete((V) oldValue.clone());
 				}

diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/prism/component/PolyStringEditorPanel.java b/...i/src/main/java/com/evolveum/midpoint/gui/impl/prism/component/PolyStringEditorPanel.java
@@ -27,6 +27,7 @@
 import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnBlurAjaxFormUpdatingBehaviour;
 import com.evolveum.midpoint.web.security.MidPointApplication;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringTranslationType;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -145,10 +146,21 @@ public String getObject() {
             @Override
             public void setObject(String object) {
                 if (getModelObject() == null){
-                    getModel().setObject(new PolyString(object));
+                    if (StringUtils.isBlank(object)) {
+                        getModel().setObject(null);
+                    } else {
+                        getModel().setObject(new PolyString(object));
+                    }
                 } else {
                     PolyString oldModelObject = getModelObject();
-                    getModel().setObject(new PolyString(object, oldModelObject.getNorm(), oldModelObject.getTranslation(), oldModelObject.getLang()));
+                    if (StringUtils.isBlank(object)) {
+                        if (oldModelObject.getTranslation() != null || MapUtils.isNotEmpty(oldModelObject.getLang())) {
+                            getModel().setObject(new PolyString(object, oldModelObject.getNorm(), oldModelObject.getTranslation(), oldModelObject.getLang()));
+                        } else {
+                            getModel().setObject(null);
+                        }
+                    }
+
                 }
             }