Changeset 1472

Timestamp:

Feb 2, 2011, 10:59:54 AM (13 years ago)

Author:

t.w.abma@…

Message:

• after assigning properties, entities are read from Excel and invalid entities are added to wizardErrors variable to be used by the "imported data" step

File:

• trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy (modified) (3 diffs)

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

@@ -163 +163 @@
                         }
                         on("next") {
-                                if (propertiesPage(flow, params)) {
+                                if (propertiesPage(flow, flash, params)) {
                                         success()
                                 } else {
@@ -359 +359 @@
          * @returns boolean true if correctly validated, otherwise false
          */
-        boolean propertiesPage(flow, params) {
+        boolean propertiesPage(flow, flash, params) {
+        flash.wizardErrors = [:]
+        
                 // Find actual Template object from the chosen template name
                 def template = Template.get(flow.importer_template_id)
@@ -392 +394 @@
 
                 flow.importer_importeddata = table
-                flow.importer_failedcells = failedcells
-        
+
+        // loop through all entities to validate them and add them to wizardErrors flash when invalid
+        table.each { record ->
+            record.each { entity ->
+                if (!entity.validate()) {
+                                this.appendErrors(entity, flash.wizardErrors, 'entity_' + entity.getIdentifier() + '_')
+                }
+            }
+        }
+
+        flow.importer_failedcells = failedcells
+
                 return true
         }