Changeset 1392 for trunk/grails-app

Timestamp:

Jan 13, 2011, 3:15:59 PM (10 years ago)

Author:

work@…

Message:

• resolves edit study wizard issues, main ticket #275

File:

• trunk/grails-app/controllers/dbnp/studycapturing/StudyWizardController.groovy (modified) (5 diffs)

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

@@ -757 +757 @@
                                 // remove all samples from the study
                                 flow.study.samples.findAll{true}.each() { sample ->
-                                        flow.study.removeFromSamples(sample)
+                                        flow.study.deleteSample( sample )
                                 }
 
@@ -872 +872 @@
                                         // assay does not validate
                                         // remove from study
-                                        flow.study.removeFromAssays( flow.assay )
+                                        flow.study.deleteAssay( flow.assay )
 
                                         // append errors
@@ -1058 +1058 @@
 
                                         // Make sure the owner of the study is set right
-                                        flow.study.owner = authenticationService.getLoggedInUser()
+                                        if (!flow.study.owner) {
+                                                flow.study.owner = authenticationService.getLoggedInUser()
+                                        }
 
                                         if (!flow.study.save(flush:true)) {
@@ -1586 +1588 @@
                                                         flow.study.samples.findAll { (it.parentEvent.equals(event) && it.parentSubject.equals(subject) ) }.each() {
                                                                 // delete this sample
-                                                                flow.study.removeFromSamples( it )
-                                                                it.delete()
+                                                                flow.study.deleteSample( it )
                                                         }
                                                 }
@@ -1683 +1684 @@
                                                         flow.study.samples.findAll { (it.parentEvent.equals(samplingEvent) && it.parentSubject.equals(subject) && it.parentEventGroup.equals(eventGroup)) }.each() {
                                                                 // delete this sample
-                                                                flow.study.removeFromSamples(it)
-                                                                it.delete()
+                                                                flow.study.deleteSample( it )
                                                         }
                                                 }