From 1a30dc2f1c5b317982113571bd14f1a01e8c1944 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Wed, 24 Feb 2016 11:07:39 +0100
Subject: [PATCH] Bugfix for outputting parent organism in form
---
.../no/nibio/vips/logic/entity/Organism.java | 2 +-
src/main/webapp/templates/organismForm.ftl | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/no/nibio/vips/logic/entity/Organism.java b/src/main/java/no/nibio/vips/logic/entity/Organism.java
index c2372e0c..b9529291 100644
--- a/src/main/java/no/nibio/vips/logic/entity/Organism.java
+++ b/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) {
diff --git a/src/main/webapp/templates/organismForm.ftl b/src/main/webapp/templates/organismForm.ftl
index 855c9638..89965298 100644
--- a/src/main/webapp/templates/organismForm.ftl
+++ b/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>
--
GitLab