Changeset 1191 for trunk/grails-app/controllers

Timestamp:

Nov 23, 2010, 11:17:00 AM (10 years ago)

Author:

t.w.abma@…

Message:

• calling savePostview url directly gives a warning now that the files already have been imported and/or that the import wizard steps should be followed from the beginning

File:

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

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

@@ -41 +41 @@
 
     def index = {
+        // no data has been imported yet
+        session.validatedSuccesfully = null
+
         // should do a check what is in the url, strip it?
         session.import_referer = params.redirectTo
@@ -334 +337 @@
      */
     def savePostview = {
-        def validatedSuccesfully = ImporterService.saveDatamatrix(session.importer_study, session.importer_importeddata)
-        render(view:"step4", model:[validatedSuccesfully:validatedSuccesfully, totalrows:session.importer_importeddata.size, referer: session.import_referer])
+        
+        if (session.validatedSuccesfully) {
+            render (template:"common/error",
+                    model:[error:"Data is already imported or you are calling the url directly without following the previous import steps."])
+        } else {
+            session.validatedSuccesfully = ImporterService.saveDatamatrix(session.importer_study, session.importer_importeddata)
+            render(view:"step4", model:[validatedSuccesfully:session.validatedSuccesfully, totalrows:session.importer_importeddata.size, referer: session.import_referer])
+        }
     }