Changeset 1277 for trunk/grails-app/taglib

Timestamp:

Dec 16, 2010, 3:42:15 PM (13 years ago)

Author:

t.w.abma@…

Message:

• rewrite of the Importer Wizard into an Ajaxflow

File:

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

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

@@ -69 +69 @@
      */
     def failedCells = { attrs ->
-        def failedcells = attrs['failedcells']
-        out << render (template:"common/failedcells", model:[failedcells:failedcells])
+        def failedcells = attrs['failedcells']
+        out << render (template:"common/failedcells", model:[failedcells:failedcells])
     }
 
@@ -76 +76 @@
      * @param entities array containing selected entities
      * @param header array containing mappingcolumn objects
-     * @param allfieldtypes if set, show all fields
-     * @param layout constant value: "horizontal" or "vertical"
+     * @param allfieldtypes if set, show all fields    
      */
     def properties = { attrs ->
         def header = attrs['header']
         def entities = attrs['entities']
-        def allfieldtypes = (attrs['allfieldtypes']==null) ? "false" : "true"
-        def layout = (attrs['layout']==null) ? "vertical" : attrs['layout']
-
-        //choose template for vertical layout (default) or horizontal layout
-        def template = (layout == "vertical") ? "common/properties_vertical" : "common/properties_horizontal"
-        
-        out << render ( template:template,
-                        model:[selectedentities:entities,
-                        standardentities:grailsApplication.config.gscf.domain.importableEntities,
-                        header:header,
-                        allfieldtypes:allfieldtypes,
-                        layout:layout]
-                        )
+
+        out << render ( template:"common/properties_horizontal" )
     }
 
@@ -110 +98 @@
         // TODO: this should be changed to retrieving fields per entity instead of from one template
         //       and session variables should not be used inside the service, migrate to controller
-
-        def t = Template.get(session.importer_template_id)
+    
+        def t = Template.get(attrs['template_id'])
         def mc = attrs['mappingcolumn']
         def allfieldtypes = attrs['allfieldtypes']
-        def matchvalue = attrs['matchvalue']
+    def matchvalue = attrs['matchvalue']
         def domainfields = mc.entity.giveDomainFields().findAll { it.type == mc.templatefieldtype }
             domainfields = domainfields.findAll { it.preferredIdentifier != mc.identifier}