diff --git a/src/main/java/no/nibio/web/forms/FormField.java b/src/main/java/no/nibio/web/forms/FormField.java index 4da5599561df0955b2fefb9c9c47adabd4926f1c..65e23918e16b8888104ca29dfe69439ca0273245 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 fc356a6ee80efc54c6f267c1324c54cc36f9713d..941ae5a03473b68ca6dcc33d071c0d67655e40eb 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 3d3b9bfbe17adc41b85f64a29861f2c75cfda5e0..1d15d5137f2932af3ec395d261aea883c33730e1 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>'; }