Changeset 2695

Timestamp:

03/09/10 17:09:22 (6 months ago)

Author:

mswertz

Message:

bugfix: null on xrefs.
Note: I want to appologize for premature commit of all these errors.

Files:

• molgenis/3.3/src/org/molgenis/generators/ui/FormScreenGen.java.ftl (modified) (1 diff)

molgenis/3.3/src/org/molgenis/generators/ui/FormScreenGen.java.ftl

@@ -163 +163 @@
                         input.setXrefLabels(Arrays.asList("${csv(field.xrefLabelNames)}".split(",")));
                         //initialize the ${field.xrefEntityName}.${csv(field.xrefLabelNames)} of current record
-                        <#if field.xrefLabelNames[0] != field.xrefFieldName><#list field.xrefLabelNames as label>
+                        <#if field.xrefLabelNames[0] != field.xrefFieldName>
+                                <#list field.xrefLabelNames as label>
                         input.setValueLabel<#if inputtype = "Mref">s</#if>("${label}", entity.get${JavaName(field)}_${label}()); 
-                        </#list><#else>
-                        input.setValueLabel<#if inputtype = "Mref">s</#if>("${field.xrefField}", entity.get${JavaName(field)}());
+                                </#list>
+                        <#else>
+                        input.setValueLabel<#if inputtype = "Mref">s</#if>("${field.xrefField.name}", entity.get${JavaName(field)}());
                         </#if>
                         </#if>