fix #9913 fixing collection label in select lists
authorAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Tue, 11 Jan 2022 11:44:37 +0000 (12:44 +0100)
committerAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Tue, 11 Jan 2022 11:44:37 +0000 (12:44 +0100)
src/main/java/eu/etaxonomy/cdm/vaadin/util/CollectionCaptionGenerator.java

index 18ad17201b393141249b105513230ad8df46da6d..50833dad9b0e8048dd37a02df0494ed42288662e 100644 (file)
@@ -10,6 +10,7 @@ package eu.etaxonomy.cdm.vaadin.util;
 
 import java.util.Objects;
 
+import org.apache.commons.lang3.StringUtils;
 import org.vaadin.viritin.fields.CaptionGenerator;
 
 import eu.etaxonomy.cdm.model.occurrence.Collection;
@@ -28,10 +29,12 @@ public final class CollectionCaptionGenerator implements CaptionGenerator<Collec
     @Override
     public String getCaption(Collection option) {
         String caption = Objects.toString(option.getCode(), "");
-        option.getTitleCache();
         if(option.getInstitute() != null){
             caption += (caption.isEmpty() ? "" : " - ") + option.getInstitute().getTitleCache();
         }
+        if(StringUtils.isBlank(caption)) {
+            caption = option.getTitleCache();
+        }
         return caption;
     }
 }
\ No newline at end of file