Changeset 1358 for trunk/grails-app

Timestamp:

Jan 11, 2011, 12:46:56 PM (10 years ago)

Author:

t.w.abma@…

Message:

• fixed study.id error when logged in as new user and trying to import a new study

File:

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

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

@@ -10 +10 @@
 import grails.converters.JSON
 import cr.co.arquetipos.crypto.Blowfish
+
+import org.codehaus.groovy.grails.plugins.web.taglib.ValidationTagLib
 
 /**
@@ -31 +33 @@
     def fileService
     def ImporterService
+    def validationTagLib = new ValidationTagLib()
         
     /**
@@ -121 +124 @@
             }
             on("next") {
-                if (fileImportPage(flow, params)) {                    
-                    success()
-                } else {
-                    println "field is missing"
-                    error()
-                }
+                // Study selected?
+                flow.importer_study = (params.study) ? Study.get(params.study.id.toInteger()) : null
+
+                // Trying to import a new study?
+                if (flow.importer_study)
+                    if (flow.importer_study.canWrite(AuthenticationService.getLoggedInUser())) {
+                        if (fileImportPage(flow, params)) {
+                            success()
+                        } else {
+                            error.log ".importer wizard not all fields are filled in"
+                            error()
+                        }
+                    } else
+                    {
+                        error.log ".importer wizard wrong permissions"
+                    }
+                else {
+                   if (fileImportPage(flow, params)) {
+                            success()
+                        } else {
+                            error.log ".importer wizard not all fields are filled in"
+                            error()
+                        }
+                }
+
+
+                
                 // put your bussiness logic (if applicable) in here
             }.to "pageTwo"
@@ -156 +180 @@
             }
             on("next") {
-                if (propertiesPage(flow, params)) {
-                    println "HIER"
+                if (propertiesPage(flow, params)) {                    
                     success()
                 } else {
@@ -188 +211 @@
             }.to "pageThree"
             on("next") {
-                if (mappingsPage(flow, params)) {
+                if (mappingsPage(flow, flash, params)) {
                     success()
                 } else {
-                    log.error ".import wizard mapping error, could not validate all entities"
-                    error()                    
+                    log.error ".import wizard mapping error, could not validate all entities"                    
+                    error()                  
                 }
             }.to "pageFour"
@@ -242 +265 @@
                     if (pluginManager.getGrailsPlugin('grom')) ".persisting instances to the database...".grom()                    
 
-                    if (saveEntities(flow, params)) {
-                        println "succes"
+                    if (saveEntities(flow, params)) {                        
                         success()
                     } else {
@@ -263 +285 @@
         // render errors
         error {
+            //println "error?"
             render(view: "_error")
             onRender {
@@ -342 +365 @@
             
             // Initialize some session variables
-            //flow.importer_workbook = wb // workbook object must be serialized for this to work
-            flow.importer_study = Study.get(params.study.id.toInteger())            
-
-             // Is the current logged in user allowed to write to this study?
-             if (flow.importer_study.canWrite(AuthenticationService.getLoggedInUser())) {
+            //flow.importer_workbook = wb // workbook object must be serialized for this to work            
+             
                 flow.importer_template_id = params.template_id
                 flow.importer_sheetindex = params.sheetindex.toInteger() -1 // 0 == first sheet
@@ -373 +393 @@
               
                 flow.importer_templates = Template.get(flow.importer_template_id)
-                flow.importer_allfieldtypes = "true"
-            } // end of if
+                flow.importer_allfieldtypes = "true"     
             /*else {
                 render (template:"common/error",
@@ -435 +454 @@
      * @returns boolean true if correctly validated, otherwise false
      */
-    boolean mappingsPage(flow,params) {        
+    boolean mappingsPage(flow, flash, params) {
+        flash.wizardErrors = [:]
         flow.importer_invalidentities = 0        
 
@@ -461 +481 @@
                 if (!entity.validate() || invalidontologies) {
                     flow.importer_invalidentities++
+
+                    // add errors to map
+                    this.appendErrors(entity, flash.wizardErrors, 'subject_' + entity.getIdentifier() + '_')                    
                     
                                         entity.errors.getAllErrors().each() {
@@ -505 +528 @@
             return true
     }
+
+    /**
+         * append errors of a particular object to a map
+         * @param object
+         * @param map linkedHashMap
+         * @void
+         */
+        def appendErrors(object, map) {
+                this.appendErrorMap(getHumanReadableErrors(object), map)
+        }
+
+        def appendErrors(object, map, prepend) {
+                this.appendErrorMap(getHumanReadableErrors(object), map, prepend)
+        }
+
+    /**
+         * append errors of one map to another map
+         * @param map linkedHashMap
+         * @param map linkedHashMap
+         * @void
+         */
+        def appendErrorMap(map, mapToExtend) {
+                map.each() {key, value ->
+                        mapToExtend[key] = ['key': key, 'value': value, 'dynamic': false]
+                }
+        }
+
+        def appendErrorMap(map, mapToExtend, prepend) {
+                map.each() {key, value ->
+                        mapToExtend[prepend + key] = ['key': key, 'value': value, 'dynamic': true]
+                }
+        }
+
+    /**
+         * transform domain class validation errors into a human readable
+         * linked hash map
+         * @param object validated domain class
+         * @return object  linkedHashMap
+         */
+        def getHumanReadableErrors(object) {
+                def errors = [:]
+                object.errors.getAllErrors().each() { error ->
+                        // error.codes.each() { code -> println code }
+
+                        // generally speaking g.message(...) should work,
+                        // however it fails in some steps of the wizard
+                        // (add event, add assay, etc) so g is not always
+                        // availably. Using our own instance of the
+                        // validationTagLib instead so it is always
+                        // available to us
+                        errors[ error.getArguments()[0] ] = validationTagLib.message(error: error)
+                }
+
+                return errors
+        }
 }