From 288cde1359efa186c97a2a74522caf270dfa03a8 Mon Sep 17 00:00:00 2001
From: Katja Luther <k.luther@bgbm.org>
Date: Thu, 15 Sep 2016 11:50:27 +0200
Subject: [PATCH] fix #5874: display of infrageneric epithet are different for
 zoological and botanical names

---
 .../taxeditor/ui/section/name/NameDetailElement.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
index 7c1006328..84a1ae49e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
@@ -179,8 +179,14 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<N
 	}
 
 	private void createInfragenerericEpithetControls(ICdmFormElement element, NonViralName nonViralName, int style){
-		if((nonViralName.getRank() != null && nonViralName.getRank().isLower(Rank.GENUS())) && !nonViralName.getRank().isLower(Rank.SPECIES())){
-			text_infragenericEpithet = formFactory.createTextWithLabelElement(element, "Infrageneric Epithet", nonViralName.getInfraGenericEpithet(), style);
+		if (nonViralName.getNomenclaturalCode().equals(NomenclaturalCode.ICZN)){
+			if(nonViralName.getRank() != null && nonViralName.getRank().isLower(Rank.GENUS()) ){
+				text_infragenericEpithet = formFactory.createTextWithLabelElement(element, "Infrageneric Epithet", nonViralName.getInfraGenericEpithet(), style);
+			}
+		} else{
+			if((nonViralName.getRank() != null && nonViralName.getRank().isLower(Rank.GENUS())) && !nonViralName.getRank().isLower(Rank.SPECIES()) && !nonViralName.getRank().isSpeciesAggregate()){
+				text_infragenericEpithet = formFactory.createTextWithLabelElement(element, "Infrageneric Epithet", nonViralName.getInfraGenericEpithet(), style);
+			}
 		}
 	}
 
-- 
2.34.1