From: Andreas Kohlbecker Date: Thu, 8 Nov 2018 14:12:43 +0000 (+0100) Subject: restoring accidentally removed formatter code X-Git-Tag: 5.5.0^2~88 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdm-vaadin.git/commitdiff_plain/7bbbad58e411f33863d70345dee6978c02273ef4 restoring accidentally removed formatter code --- diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/event/EditorActionContextFormatter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/event/EditorActionContextFormatter.java index 8fa4d2ae..adc0123a 100644 --- a/src/main/java/eu/etaxonomy/cdm/vaadin/event/EditorActionContextFormatter.java +++ b/src/main/java/eu/etaxonomy/cdm/vaadin/event/EditorActionContextFormatter.java @@ -13,6 +13,8 @@ import java.util.Stack; import org.apache.commons.lang3.StringUtils; +import com.vaadin.ui.Component; + import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.ref.TypedEntityReference; import eu.etaxonomy.cdm.vaadin.event.EditorActionContextFormat.TargetInfoType; @@ -72,6 +74,18 @@ public class EditorActionContextFormatter { if (propertyIdPath != null) { targetInfo = propertyIdPath.toString(); } + } else { + // TargetInfoType.FIELD_CAPTION + if(parentCtx.getTargetField() != null){ + Component captionComponent = parentCtx.getTargetField(); + while(captionComponent != null){ + targetInfo = captionComponent.getCaption(); + if(targetInfo != null){ + break; + } + captionComponent = captionComponent.getParent(); + } + } } } }