Changeset 545 for trunk/grails-app/taglib

Timestamp:

Jun 9, 2010, 12:54:12 PM (11 years ago)

Author:

tabma

Message:

• fixed Advanced Import Wizard (preferredIdentifier issues)

File:

• trunk/grails-app/taglib/dbnp/importer/ImporterTagLib.groovy (modified) (1 diff)

trunk/grails-app/taglib/dbnp/importer/ImporterTagLib.groovy

@@ -83 +83 @@
         def mc = attrs['mappingcolumn']
         def allfieldtypes = attrs['allfieldtypes']
+        def domainfields = mc.entity.giveDomainFields().findAll { it.type == mc.templatefieldtype }
+            domainfields = domainfields.findAll { it.preferredIdentifier != mc.identifier}
 
         //def templatefields = (allfieldtypes=="true") ? t.fields : t.fields.findAll { it.type == mc.templatefieldtype }
         def templatefields = (allfieldtypes=="true") ? 
             t.fields + mc.entity.giveDomainFields() :
-            t.fields.findAll { it.type == mc.templatefieldtype } + mc.entity.giveDomainFields()
+            t.fields.findAll { it.type == mc.templatefieldtype } + domainfields
 
-        (mc.identifier) ? out << "<select style=\"font-size:10px\" name=\"\" disabled><option>Identifier</option></select>":
+        // map identifier to preferred column
+        def prefcolumn = mc.entity.giveDomainFields().findAll { it.preferredIdentifier == true }
+
+        (mc.identifier) ? out << createPropertySelect(attrs['name'], prefcolumn, mc.index) :
             out << createPropertySelect(attrs['name'], templatefields, mc.index)
     }