Bugfix for outputting parent organism in form

src/main/java/no/nibio/vips/logic/entity/Organism.java

@@ -131,7 +131,7 @@ public class Organism implements Serializable {
     }
 
     public String getLatinName() {
-        return latinName;
+        return latinName != null ? latinName : "";
     }
 
     public void setLatinName(String latinName) {

src/main/webapp/templates/organismForm.ftl

@@ -53,13 +53,15 @@
 	    <select class="form-control" name="parentOrganismId" onblur="validateField(this);">
 	    	<option value="-1">${i18nBundle.pleaseSelect} ${i18nBundle.parentOrganismId?lower_case}</option>
 		<#list allOrganisms?sort_by("latinName") as parentOrganism>
-			<option value="${parentOrganism.organismId}"
-				<#if (organism.parentOrganismId?has_content && organism.parentOrganismId == parentOrganism.organismId)
-					|| (parentOrganismId?has_content && parentOrganismId == parentOrganism.organismId)
-				>
-					selected="selected"
-				</#if>
-			>${parentOrganism.latinName!""}/${parentOrganism.tradeName!""}/${parentOrganism.getLocalName(currentLocale.language)!""} (${hierarchyCategories.getName(parentOrganism.hierarchyCategoryId)})</option>
+			<#if parentOrganism.organismId gt 0>
+				<option value="${parentOrganism.organismId}"
+					<#if (organism.parentOrganismId?has_content && organism.parentOrganismId == parentOrganism.organismId)
+						|| (parentOrganismId?has_content && parentOrganismId == parentOrganism.organismId)
+					>
+						selected="selected"
+					</#if>
+				>${parentOrganism.latinName!""}/${parentOrganism.tradeName!""}/${parentOrganism.getLocalName(currentLocale.language)!""} (${hierarchyCategories.getName(parentOrganism.hierarchyCategoryId)})</option>
+			</#if>
 		</#list>
 	     </select>
 	</div>