Skip to content
Snippets Groups Projects
Commit 1a30dc2f authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Bugfix for outputting parent organism in form

parent e28486d6
Branches
No related tags found
No related merge requests found
...@@ -131,7 +131,7 @@ public class Organism implements Serializable { ...@@ -131,7 +131,7 @@ public class Organism implements Serializable {
} }
public String getLatinName() { public String getLatinName() {
return latinName; return latinName != null ? latinName : "";
} }
public void setLatinName(String latinName) { public void setLatinName(String latinName) {
......
...@@ -53,13 +53,15 @@ ...@@ -53,13 +53,15 @@
<select class="form-control" name="parentOrganismId" onblur="validateField(this);"> <select class="form-control" name="parentOrganismId" onblur="validateField(this);">
<option value="-1">${i18nBundle.pleaseSelect} ${i18nBundle.parentOrganismId?lower_case}</option> <option value="-1">${i18nBundle.pleaseSelect} ${i18nBundle.parentOrganismId?lower_case}</option>
<#list allOrganisms?sort_by("latinName") as parentOrganism> <#list allOrganisms?sort_by("latinName") as parentOrganism>
<option value="${parentOrganism.organismId}" <#if parentOrganism.organismId gt 0>
<#if (organism.parentOrganismId?has_content && organism.parentOrganismId == parentOrganism.organismId) <option value="${parentOrganism.organismId}"
|| (parentOrganismId?has_content && parentOrganismId == parentOrganism.organismId) <#if (organism.parentOrganismId?has_content && organism.parentOrganismId == parentOrganism.organismId)
> || (parentOrganismId?has_content && parentOrganismId == parentOrganism.organismId)
selected="selected" >
</#if> selected="selected"
>${parentOrganism.latinName!""}/${parentOrganism.tradeName!""}/${parentOrganism.getLocalName(currentLocale.language)!""} (${hierarchyCategories.getName(parentOrganism.hierarchyCategoryId)})</option> </#if>
>${parentOrganism.latinName!""}/${parentOrganism.tradeName!""}/${parentOrganism.getLocalName(currentLocale.language)!""} (${hierarchyCategories.getName(parentOrganism.hierarchyCategoryId)})</option>
</#if>
</#list> </#list>
</select> </select>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment