Changeset 1536 for trunk

Timestamp:

Feb 17, 2011, 4:52:50 PM (9 years ago)

Author:

t.w.abma@…

Message:

• fixed refresh of first page in import wizard, to fix: TemplateFileField? "*existing" check

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (7 diffs)
• services/dbnp/importer/ImporterService.groovy (modified) (1 diff)
• views/importer/pages/_page_one.gsp (modified) (1 diff)

trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy

@@ -112 +112 @@
 
             on("refresh") {
-                flash.importer_params = params            
+                println params.importfile
+
+                if (params.entity) {
+                    flash.importer_datatemplates = Template.findAllByEntity(GdtService.getInstanceByEntity(params.entity.decodeURL()))
+                }
+                
+                flash.importer_params = params
+
                                 success()
                         }.to "pageOne"
@@ -118 +125 @@
                         on("next") {
                                 flash.wizardErrors = [:]
-                //flash.importer_params = params
+                flash.importer_params = params
+
+                if (params.entity) {
+                    flash.importer_datatemplates = Template.findAllByEntity(GdtService.getInstanceByEntity(params.entity.decodeURL()))
+                }
 
                                 // Study selected?
@@ -145 +156 @@
                         onRender {
                                 log.info ".import wizard properties page"
+                
+                def template = Template.get(flow.importer_template_id)
+
                                 // Grom a development message
                                 if (pluginManager.getGrailsPlugin('grom')) ".rendering the partial: pages/_page_two.gsp".grom()
 
-                flow.importer_importmappings = ImportMapping.list()
+                flow.importer_importmappings = ImportMapping.findAllByTemplate(template)
 
                                 flow.page = 2
@@ -154 +168 @@
                         }
             on("refresh") {
-                flow.importer_importmappings = ImportMapping.list()
+                def template = Template.get(flow.importer_template_id)
+                flow.importer_importmappings = ImportMapping.findAllByTemplate(template)
 
                 // a name was given to the current property mapping, try to store it
@@ -164 +179 @@
                     propertiesLoadImportMappingPage(flow, flash, params)
                 }
-
-
                 
                 if (params.fuzzymatching == "true")
@@ -453 +466 @@
                 } catch (Exception e) {
                     //getNextException
-                    log.error "importer wizard save error: " + e
-                    log.error "importer wizard nextexception: " + e.getNextException()
+                    log.error "importer wizard save importmapping error: " + e
                 }
             }
@@ -466 +478 @@
     }
 
-    /*def importmappings = {
-        
-        ImportMapping.list().each { importmapping ->
-            importmapping.mappingcolumns.each { mappingcolumn ->
-                println "das"+mappingcolumn.dump()
-
-            }
-        }
-
-        render("leeg")
-    }*/
-
-        /**
+        /**
          * Handle the property mapping page.
          *

trunk/grails-app/services/dbnp/importer/ImporterService.groovy

@@ -441 +441 @@
                                 }
 
-                                try {
-                    println "importdata="+mc.entityclass
+                                try {                    
                                         // which entity does the current cell (field) belong to?
                                         switch (mc.entityclass) {

trunk/grails-app/views/importer/pages/_page_one.gsp

@@ -82 +82 @@
             </td>
             <td>
-                <g:select rel="template" entity="none" name="template_id" optionKey="id" optionValue="name" from="[]" value="${importer_params?.template_id}"/>
+                <g:select rel="template" entity="none" name="template_id" optionKey="id" optionValue="name" from="${importer_datatemplates}" value="${importer_params?.template_id}"/>
             </td>
         </tr>