MID-5715 fix - polystring editing

Evolveum · Sep 3, 2019 · e484467 · e484467
1 parent 6bf8569
commit e484467
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
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
@@ -337,7 +337,7 @@ public void onClick(AjaxRequestTarget target) {
     }
 
     private String getLocalizedPolyStringValue(){
-    	return getPageBase().getLocalizationService().translate(getModelObject());
+    	return getPageBase().getLocalizationService().translate(getModelObject(), false);
     }
 
     private IModel<List<String>> getLanguageChoicesModel(){

diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationService.java b/infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationService.java
@@ -39,10 +39,14 @@ default String translate(LocalizableMessage msg) {
         return translate(msg, getDefaultLocale());
     }
 
-    String translate(PolyString polyString, Locale locale);
-    
+    String translate(PolyString polyString, Locale locale, boolean allowOrig);
+
     default String translate(PolyString polyString) {
-        return translate(polyString, getDefaultLocale());
+        return translate(polyString, getDefaultLocale(), true);
+    }
+
+    default String translate(PolyString polyString, boolean allowOrig) {
+        return translate(polyString, getDefaultLocale(), allowOrig);
     }
 
     /**

diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationServiceImpl.java b/infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationServiceImpl.java
@@ -227,7 +227,7 @@ public <T extends CommonException> T translate(T e) {
     }
 
 	@Override
-	public String translate(PolyString polyString, Locale locale) {
+	public String translate(PolyString polyString, Locale locale, boolean allowOrig) {
 		if (polyString == null) {
 			return null;
 		}
@@ -240,7 +240,11 @@ public String translate(PolyString polyString, Locale locale) {
 		if (polyString.getTranslation() != null) {
 			return translate(polyString.getTranslation(), locale);
 		}
-		return polyString.getOrig();
+		if (allowOrig) {
+            return polyString.getOrig();
+        } else {
+		    return null;
+        }
 	}
 
 	private String translate(PolyStringTranslationType polyStringTranslation, Locale locale) {