Changeset 1632 for trunk/grails-app

Timestamp:

Mar 14, 2011, 3:49:07 PM (10 years ago)

Author:

s.h.sikkema@…

Message:

Fixed 'Assay has no value (null)' error in assay exporter

File:

• trunk/grails-app/controllers/dbnp/studycapturing/AssayController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/dbnp/studycapturing/AssayController.groovy

@@ -172 +172 @@
         def assayId = flash.assayId
 
+        println assayId
+
+        // did the assay id value come across?
+        if (!assayId) {
+            flash.errorMessage = "An error occurred: assayId = ${assayId}."
+            redirect action: 'selectAssay'
+            return
+        }
+
+        Assay assay = Assay.get(assayId)
+
+        // check if assay exists
+        if (!assay) {
+
+            flash.errorMessage = "No assay found with id: ${assayId}"
+            redirect action: 'selectAssay'
+            return
+
+        }
+
         def fieldMapSelection = [:]
 
@@ -211 +231 @@
                 measurementTokensSelection = flash.measurementTokens
             }
-
-        }
-
-        Assay assay = Assay.get(assayId)
-
-        // check if assay exists
-        if (!assay) {
-
-            flash.errorMessage = assayId ? "No assay found with id: ${assayId}" : 'Assay has no value (null).'
-            redirect action: 'selectAssay'
-            return
 
         }