Changeset 1388 for trunk/grails-app/controllers

Timestamp:

Jan 13, 2011, 10:53:50 AM (10 years ago)

Author:

t.w.abma@…

Message:

• added popup dialog with warning for first page of importer when not all fields are filled in or selected

File:

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

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

@@ -26 +26 @@
  * $Date$
  */
-@Secured(['IS_AUTHENTICATED_REMEMBERED'])
+//@Secured(['IS_AUTHENTICATED_REMEMBERED'])
 class ImporterController {
     // the pluginManager is used to check if the Grom
@@ -127 +127 @@
             }
             on("next") {
+                flash.wizardErrors = [:]
+                
                 // Study selected?
                 flow.importer_study = (params.study) ? Study.get(params.study.id.toInteger()) : null
 
-                // Trying to import a new study?
+                // Trying to import data into an existing study?
                 if (flow.importer_study)
                     if (flow.importer_study.canWrite(AuthenticationService.getLoggedInUser())) {
@@ -136 +138 @@
                             success()
                         } else {
-                            error.log ".importer wizard not all fields are filled in"
+                            log.error ".importer wizard not all fields are filled in"
+                            this.appendErrorMap(['error': "Not all fields are filled in, please fill in or select all fields"], flash.wizardErrors)
                             error()
                         }
                     } else
                     {
-                        error.log ".importer wizard wrong permissions"
+                        log.error ".importer wizard wrong permissions"
+                        this.appendErrorMap(['error': "You don't have the right permissions"], flash.wizardErrors)
+
+                        error()
                     }
                 else {
@@ -147 +153 @@
                             success()
                         } else {
-                            error.log ".importer wizard not all fields are filled in"
+                            log.error ".importer wizard not all fields are filled in"
+                            this.appendErrorMap(['error': "Not all fields are filled in, please fill in or select all fields"], flash.wizardErrors)
                             error()
                         }