Changeset 534 for trunk/grails-app/taglib

Timestamp:

Jun 4, 2010, 4:00:31 PM (13 years ago)

Author:

tabma

Message:

• rewrote MappingColumn? (and underlying methods) to have a String property instead of TemplateField?
• improved Excel-column detection to importer service

File:

• trunk/grails-app/taglib/dbnp/importer/ImporterTagLib.groovy (modified) (2 diffs)

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

@@ -84 +84 @@
         def allfieldtypes = attrs['allfieldtypes']
 
-        def templatefields = (allfieldtypes=="true") ? t.fields : t.fields.findAll { it.type == mc.templatefieldtype }
+        //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()
 
         (mc.identifier) ? out << "<select style=\"font-size:10px\" name=\"\" disabled><option>Identifier</option></select>":
@@ -102 +105 @@
         def res = "<select style=\"font-size:10px\" name=\"${name}.index.${columnIndex}\">"
 
-        options.each { f ->         
-            res += "<option value=\"${f.id}\""
-            //res += (e.type.toInteger() == selected) ? " selected" : ""
-            res += ">${f}</option>"
+        options.each { f ->
+            res+= "<option value=\"${f.name}\">"
+            
+            res+= (f.preferredIdentifier) ? 
+                    "${f.name} (IDENTIFIER)</option>" :
+                    "${f.name}</option>"
         }