Changeset 987 for trunk/grails-app/controllers/dbnp/studycapturing/PersonAffiliationController.groovy

Timestamp:

25-10-10 16:23:39 (3 years ago)

Author:

robert@…

Message:

Fixed bug #15

Files:

• trunk/grails-app/controllers/dbnp/studycapturing/PersonAffiliationController.groovy (modified) (7 diffs)

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

@@ -48 +48 @@
     static allowedMethods = [save: "POST", update: "POST", delete: "POST"]
 
+        /**
+     * Fires after every action and determines the layout of the page
+     */
+    def afterInterceptor = { model, modelAndView ->
+      println( params );
+
+      if ( params['dialog'] ) {
+        model.layout = 'dialog';
+        model.extraparams = [ 'dialog': 'true' ] ;
+      } else {
+        model.layout = 'main';
+        model.extraparams = [] ;
+      }
+    }
+
     def index = {
         redirect(action: "list", params: params)
@@ -65 +80 @@
     def save = {
         def personAffiliationInstance = new PersonAffiliation(params)
+        def extraparams = new LinkedHashMap();
+
+        if( params[ 'dialog' ] ) {
+          extraparams[ 'dialog' ] = params[ 'dialog' ]
+        }
+
         if (personAffiliationInstance.save(flush: true)) {
             flash.message = "${message(code: 'default.created.message', args: [message(code: 'personAffiliation.label', default: 'Affiliation'), personAffiliationInstance])}"
-            redirect(action: "show", id: personAffiliationInstance.id)
+            redirect(action: "show", id: personAffiliationInstance.id, params: extraparams)
         }
         else {
@@ -98 +119 @@
     def update = {
         def personAffiliationInstance = PersonAffiliation.get(params.id)
+
+        def extraparams = new LinkedHashMap();
+
+        if( params[ 'dialog' ] ) {
+          extraparams[ 'dialog' ] = params[ 'dialog' ]
+        }
+
         if (personAffiliationInstance) {
             if (params.version) {
@@ -111 +139 @@
             if (!personAffiliationInstance.hasErrors() && personAffiliationInstance.save(flush: true)) {
                 flash.message = "${message(code: 'default.updated.message', args: [message(code: 'personAffiliation.label', default: 'Affiliation'), personAffiliationInstance])}"
-                redirect(action: "show", id: personAffiliationInstance.id)
+                redirect(action: "show", id: personAffiliationInstance.id, params: extraparams)
             }
             else {
@@ -119 +147 @@
         else {
             flash.message = "${message(code: 'default.not.found.message', args: [message(code: 'personAffiliation.label', default: 'Affiliation'), params.id])}"
-            redirect(action: "list")
+            redirect(action: "list", params: extraparams)
         }
     }
@@ -125 +153 @@
     def delete = {
         def personAffiliationInstance = PersonAffiliation.get(params.id)
+
+        def extraparams = new LinkedHashMap();
+
+        if( params[ 'dialog' ] ) {
+          extraparams[ 'dialog' ] = params[ 'dialog' ]
+        }
+
         if (personAffiliationInstance) {
             def affiliationName = personAffiliationInstance.toString()
@@ -130 +165 @@
                 personAffiliationInstance.delete(flush: true)
                 flash.message = "${message(code: 'default.deleted.message', args: [message(code: 'personAffiliation.label', default: 'Affiliation'), affiliationName])}"
-                redirect(action: "list")
+                redirect(action: "list", params: extraparams)
             }
             catch (org.springframework.dao.DataIntegrityViolationException e) {
                 flash.message = "${message(code: 'default.not.deleted.message', args: [message(code: 'personAffiliation.label', default: 'Affiliation'), affiliationName])}"
-                redirect(action: "show", id: params.id)
+                redirect(action: "show", id: params.id, params: extraparams)
             }
         }
         else {
             flash.message = "${message(code: 'default.not.found.message', args: [message(code: 'personAffiliation.label', default: 'Affiliation'), params.id])}"
-            redirect(action: "list")
+            redirect(action: "list", params: extraparams)
         }
     }