Changeset 817

Timestamp:

Aug 17, 2010, 2:42:54 PM (13 years ago)

Author:

keesvb

Message:

fixed deleting of event groups, they now also cascade to samples in the event group

Location:

trunk

Files:

• grails-app/domain/dbnp/studycapturing/Study.groovy (modified) (2 diffs)
• test/integration/gscf/SampleTests.groovy (modified) (2 diffs)

trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

@@ -318 +318 @@
                                         msg += ", sample '${it.name}' was deleted"
                                         this.removeFromSamples( it )
+                                        // Also here, contrary to documentation, an extra delete() is needed
+                                        it.delete()
                                 }
                         }
@@ -342 +344 @@
                 println ".remove eventGroup '${eventGroup.name}' from study '${this.title}'"
                 this.removeFromEventGroups(eventGroup)
+                // Also here, contrary to documentation, an extra delete() is needed
+                eventGroup.delete()
 
                 return msg

trunk/test/integration/gscf/SampleTests.groovy

@@ -60 +60 @@
                 )
 
-                if (!samplingEvent.validate()) {
-                        samplingEvent.errors.each { println it}
-                }
                 // The SamplingEvent should not validate at this point because it doesn't have a parent study
                 assert !samplingEvent.validate()
@@ -223 +220 @@
                 )
                 study.addToEventGroups(group)
+                assert group.validate()
+
+
                 group.addToSubjects(subject)
                 group.addToSamplingEvents(event)