Changeset 1736

Timestamp:

Apr 8, 2011, 4:03:23 PM (9 years ago)

Author:

work@…

Message:

• resolves issue #384, studyPerson, publications and users are not deleted properly

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/StudyWizardController.groovy (modified) (5 diffs)
• domain/dbnp/studycapturing/Person.groovy (modified) (1 diff)
• domain/dbnp/studycapturing/PersonAffiliation.groovy (modified) (1 diff)

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

@@ -1316 +1316 @@
 
                    // First remove the publication that are not present in the array
-                   if( study.publications )
-                           study.publications.removeAll { publication -> !publicationIDs.find { id -> id == publication.id } }
+                   if( study.publications ) {
+                           study.publications.findAll { publication -> !publicationIDs.find { id -> id == publication.id } }.each {
+                                   study.removeFromPublications(it)
+                           }
+                   }
 
                    // Add those publications not yet present in the database
@@ -1333 +1336 @@
            } else {
                    log.info('.no publications selected.')
-                   if( study.publications )
-                           study.publications.clear()
+                   if( study.publications ) {
+                           study.publications.each {
+                                   study.removeFromPublications(it)
+                           }
+                   }
            }
    }
@@ -1363 +1369 @@
                    // First remove the contacts that are not present in the array
                    if( study.persons ) {
-                           study.persons.removeAll {
+                           study.persons.findAll {
                                    studyperson -> !contactIDs.find { ids -> (ids.person == studyperson.person.id) && (ids.role == studyperson.role.id) }
+                           }.each {
+                                   study.removeFromPersons(it)
+                                   it.delete()
                            }
                    }
@@ -1394 +1403 @@
            } else {
                    log.info('.no persons selected.')
-                   if( study.persons )
-                           study.persons.clear()
+                   if( study.persons ) {
+                           // removing persons from study
+                           study.persons.each {
+                                   study.removeFromPersons(it)
+                                   it.delete()
+                           }
+                   }
            }
    }
@@ -1453 +1467 @@
                    users.each { study.addToReaders(it) }
            } else if (type == "writers") {
-                   if (study.writers)
-                           study.writers.clear()
+                   if (study.writers) {
+                           study.writers.each {
+                                        study.removeFromWriters(it)
+                           }
+                   }
 
                    users.each { study.addToWriters(it) }

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

@@ -46 +46 @@
     }
 
-
+        def String toString() {
+                return "${lastName}, ${firstName}"
+        }
 }

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

@@ -12 +12 @@
  */
 class PersonAffiliation extends Identity {
-
         String institute
         String department