polystring fix

Evolveum · May 6, 2019 · 24708dd · 24708dd
1 parent 3904e2e
commit 24708dd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java b/...main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java
@@ -98,7 +98,7 @@ public C convertToObject(String value, Locale arg1) throws ConversionException {
 						}
 
 						for (LookupTableRowType row : lookupTable.getRow()) {
-							if (value.equals(WebComponentUtil.getDisplayPolyStringValue(row.getLabel(), (PageBase) getPage()))) {
+							if (value.equals(WebComponentUtil.getDisplayPolyStringValue(row.getLabel() != null ? row.getLabel().toPolyString() : null, (PageBase) getPage()))) {
 								return (C) row.getKey();
 							}
 						}
@@ -116,7 +116,7 @@ public String convertToString(C key, Locale arg1) {
 						if (lookupTable != null) {
 							for (LookupTableRowType row : lookupTable.getRow()) {
 								if (key.equals(row.getKey())) {
-									return (String) WebComponentUtil.getDisplayPolyStringValue(row.getLabel(), (PageBase) getPage());
+									return (String) WebComponentUtil.getDisplayPolyStringValue(row.getLabel() != null ? row.getLabel().toPolyString() : null, (PageBase) getPage());
 								}
 							}
 						}