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

Handle organism "Missing in database"

parent 20227713
No related branches found
No related tags found
No related merge requests found
......@@ -33,7 +33,7 @@ public class HierarchyCategoryLocaleNames {
public String getName(Integer hierarchyCategoryId)
{
return this.nameMap.get(hierarchyCategoryId);
return this.nameMap.get(hierarchyCategoryId) != null ? this.nameMap.get(hierarchyCategoryId) : "";
}
public List<Integer> getHierarchyCategoryIds()
......
......@@ -447,8 +447,9 @@
</#if>
var cropList = [
<#if ! observation.observationId?has_content || user.isSuperUser() || user.isOrganizationAdmin()>
{organismId: -10, displayName: "${i18nBundle.missingInDatabase}", hierarchyCategoryId: -1},
<#list allCrops as cropOrganism>
{organismId: ${cropOrganism.organismId}, displayName: "${cropOrganism.getLocalName(currentLocale.language)!""} (${cropOrganism.latinName!""}) ${hierarchyCategories.getName(cropOrganism.hierarchyCategoryId)?upper_case}", hierarchyCategoryId: ${cropOrganism.hierarchyCategoryId}}<#sep>,
{organismId: ${cropOrganism.organismId?c}, displayName: "${cropOrganism.getLocalName(currentLocale.language)!""} (${cropOrganism.latinName!""}) ${hierarchyCategories.getName(cropOrganism.hierarchyCategoryId)?upper_case}", hierarchyCategoryId: ${cropOrganism.hierarchyCategoryId!"-1"}}<#sep>,
</#list>
<#else>
<#list allCrops as cropOrganism>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment