From 6d200b0c6110267e2f5a1de612f3edc02e8bf926 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 18 Apr 2018 09:28:37 +0200
Subject: [PATCH] Fixing a bugfix
---
src/main/java/no/nibio/web/forms/FormField.java | 2 ++
src/main/java/no/nibio/web/forms/FormSelectOption.java | 2 --
src/main/webapp/js/forecastConfigurationForm.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/no/nibio/web/forms/FormField.java b/src/main/java/no/nibio/web/forms/FormField.java
index 4da55995..65e23918 100755
--- a/src/main/java/no/nibio/web/forms/FormField.java
+++ b/src/main/java/no/nibio/web/forms/FormField.java
@@ -20,6 +20,7 @@
package no.nibio.web.forms;
import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.Point;
@@ -42,6 +43,7 @@ import java.util.TimeZone;
* @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class FormField {
public final static String DATA_TYPE_STRING = "STRING";
public final static String DATA_TYPE_INTEGER = "INTEGER";
diff --git a/src/main/java/no/nibio/web/forms/FormSelectOption.java b/src/main/java/no/nibio/web/forms/FormSelectOption.java
index fc356a6e..941ae5a0 100755
--- a/src/main/java/no/nibio/web/forms/FormSelectOption.java
+++ b/src/main/java/no/nibio/web/forms/FormSelectOption.java
@@ -48,7 +48,6 @@ public class FormSelectOption {
/**
* @return the label
*/
- @JsonIgnore
public String getLabel() {
return label;
}
@@ -56,7 +55,6 @@ public class FormSelectOption {
/**
* @param label the label to set
*/
- @JsonIgnore
public void setLabel(String label) {
this.label = label;
}
diff --git a/src/main/webapp/js/forecastConfigurationForm.js b/src/main/webapp/js/forecastConfigurationForm.js
index 3d3b9bfb..1d15d513 100755
--- a/src/main/webapp/js/forecastConfigurationForm.js
+++ b/src/main/webapp/js/forecastConfigurationForm.js
@@ -167,7 +167,7 @@ function createFieldHTML(modelId, formId, fieldDefinition)
else if(fieldDefinition.fieldType === fieldTypes.TYPE_SELECT_SINGLE || fieldDefinition.fieldType === fieldTypes.TYPE_SELECT_MULTIPLE)
{
fieldHTML = '<select class="form-control" name="' + fieldDefinition.name + '"onblur="validateField(this,\'' + modelId + '\')" ' + (fieldDefinition.fieldType === fieldTypes.TYPE_SELECT_MULTIPLE ? ' multiple="multiple"' : '') + '>';
- fieldHTML += getLocalizedOptionsHTML(fieldDefinition.options);
+ fieldHTML += getLocalizedOptionsHTML(fieldDefinition.selectOptions);
fieldHTML += '</select>';
}
--
GitLab