Changeset 9 for trunk/grails-app/controllers/nl/tno/metagenomics/RunController.groovy

Timestamp:

Jan 28, 2011, 12:30:39 PM (9 years ago)

Author:

robert@…

Message:

 

File:

• trunk/grails-app/controllers/nl/tno/metagenomics/RunController.groovy (modified) (6 diffs)

trunk/grails-app/controllers/nl/tno/metagenomics/RunController.groovy

@@ -31 +31 @@
 
                 // Send the assay information to the view
-                [run: run, otherAssays: otherAssays, editable: true]
+                [run: run, allRuns: Run.list(), otherAssays: otherAssays, editable: true]
         }
 
@@ -45 +45 @@
                         return
                 }
-
-                Assay assay = getAssay( params.id )
-
-                if( !assay ) {
-                        render flash.error;
-                        return
+                
+                Assay assay = null
+                if( params.assayId ) {
+                        assay = getAssay( params.assayId )
+        
+                        if( !assay ) {
+                                render flash.error;
+                                return
+                        }
                 }
 
@@ -81 +84 @@
 
         def update = {
-                if( !params.assayId ) {
-                        flash.error = "No assay id given"
-                        redirect(controller: 'study')
-                        return
-                }
-
-                Assay assay = getAssay(params.assayId);
-
-                if( !a ) {
-                        redirect( controller: 'study' );
-                }
-
                 Run run = getRun( params.id );
 
@@ -102 +93 @@
                 // Set properties to the run
                 params.parameterFile = params.editParameterFile
+                
+                println "Edit run: " + params
                 run.setPropertiesFromForm( params );
 
@@ -109 +102 @@
                         flash.error = "Run could not be saved: " + run.getErrors();
                 }
-
-                redirect( controller: 'assay', action: 'show', id: params.assayId)
+                
+                Assay assay = getAssay(params.assayId);
+                flash.error = "";
+                
+                if( assay ) {
+                        redirect( controller: 'assay', action: 'show', id: assay.id)
+                } else {
+                        redirect( controller: 'run', action: 'show', id: run.id )
+                }
         }
 
@@ -286 +286 @@
                                 def assaySampleParams = sampleParams.get( assaySample.id as String );
                                 if( assaySampleParams ) {
+                                        assaySample.tagName = assaySampleParams.tagName
                                         assaySample.oligoNumber = assaySampleParams.oligoNumber
                                         assaySample.tagSequence = assaySampleParams.tagSequence