diff --git a/src/main/java/no/nibio/vips/logic/util/HierarchyCategoryLocaleNames.java b/src/main/java/no/nibio/vips/logic/util/HierarchyCategoryLocaleNames.java index 3918f9d8f93a91c3bebe1e22e19778e5aa5b382e..9d3583ca3b2b47a8a6733f67ab485a6c00d6d788 100755 --- a/src/main/java/no/nibio/vips/logic/util/HierarchyCategoryLocaleNames.java +++ b/src/main/java/no/nibio/vips/logic/util/HierarchyCategoryLocaleNames.java @@ -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() diff --git a/src/main/webapp/templates/observationForm.ftl b/src/main/webapp/templates/observationForm.ftl index 43590675ff00a49c696e16e6595b71d55c3603df..d34ca3f43e38262ce05a66206edcf711a92d0d25 100755 --- a/src/main/webapp/templates/observationForm.ftl +++ b/src/main/webapp/templates/observationForm.ftl @@ -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>