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

Fixing a bugfix

parent e866cee4
No related branches found
No related tags found
No related merge requests found
......@@ -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";
......
......@@ -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;
}
......
......@@ -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>';
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment