Changeset 254 for trunk/grails-app/controllers

Timestamp:

Dec 30, 2009, 4:33:42 AM (14 years ago)

Author:

gav

Message:

Add ajax feature to show persons in the group when creating and editing assignedGroup.
Remove the list and show detailed views since they are no longer used.

File:

• trunk/grails-app/controllers/AssignedGroupDetailedController.groovy (modified) (6 diffs)

trunk/grails-app/controllers/AssignedGroupDetailedController.groovy

@@ -12 +12 @@
     // the delete, save and update actions only accept POST requests
     static allowedMethods = [delete:'POST', save:'POST', update:'POST']
-
-    def list = {
-            def result = assignedGroupService.list(params)
-            if(!result.error) {
-                return [ assignedGroupInstanceList: result.assignedGroupInstanceList,
-                                assignedGroupInstanceTotal: result.assignedGroupInstanceTotal ]
-            }
-
-            flash.message = g.message(code: result.error.code, args: result.error.args)
-            redirect( controller: "appCore", action: "start" )
-    }
-
-    def show = {
-        def result = assignedGroupService.show(params)
-
-        if(!result.error)
-            return [ assignedGroupInstance: result.assignedGroupInstance ]
-
-        flash.message = g.message(code: result.error.code, args: result.error.args)
-
-        if(params.task?.id)
-            redirect(controller:"taskDetailed", action:"show", id: params.task.id)
-
-        redirect(controller:"taskDetailed", action:"search")
-    }
 
     def delete = {
@@ -60 +35 @@
         def result = assignedGroupService.edit(params)
 
-        if(!result.error)
-            return [ assignedGroupInstance : result.assignedGroupInstance ]
+        if(!result.error) {
+            return [assignedGroupInstance: result.assignedGroupInstance,
+                            personGroup: result.personGroup,
+                            personsInGroup: result.personsInGroup]
+        }
 
         flash.message = g.message(code: result.error.code, args: result.error.args)
@@ -74 +52 @@
         if(!result.error) {
             flash.message = g.message(code: "default.update.success", args: ["AssignedGroup", params.id])
-            redirect(action:show, id: params.id)
+            redirect(controller:"taskDetailed", action:"show", id: result.assignedGroupInstance.task.id)
             return
         }
@@ -84 +62 @@
         }
 
-        render(view:'edit', model:[assignedGroupInstance: result.assignedGroupInstance.attach()])
+        if(result.error.code == "personGroup.not.found") {
+            flash.message = g.message(code: result.error.code, args: result.error.args)
+            redirect(action:"edit", id: params.id)
+            return
+        }
+
+        render(view:'edit', model:[assignedGroupInstance: result.assignedGroupInstance.attach(),
+                                                personGroup: result.personGroup.attach(),
+                                                personsInGroup: result.personsInGroup])
     }
 
@@ -90 +76 @@
         def result = assignedGroupService.create(params)
 
-        if(!result.error)
-            return [assignedGroupInstance: result.assignedGroupInstance]
+        if(!result.error) {
+            return [assignedGroupInstance: result.assignedGroupInstance,
+                            personGroup: result.personGroup,
+                            personsInGroup: result.personsInGroup]
+        }
 
         if(result.error.code == "assignedGroup.task.not.found") {
@@ -112 +101 @@
         }
 
-        render(view:'edit', model:[assignedGroupInstance: result.assignedGroupInstance])
+        if(result.error.code == "personGroup.not.found") {
+            flash.message = g.message(code: result.error.code, args: result.error.args)
+            redirect(action:"create", params:["task.id": params.task?.id])
+            return
+        }
+
+        render(view:'create', model:[assignedGroupInstance: result.assignedGroupInstance,
+                                                personGroup: result.personGroup.attach(),
+                                                personsInGroup: result.personsInGroup])
+    }
+
+    def personsInGroup = {
+        def result = assignedGroupService.personsInGroup(params)
+
+        if(!result.error) {
+            render ( template:"personsInGroup",
+                            model: [personGroup: result.personGroup, personsInGroup: result.personsInGroup] )
+            return
+        }
+
+        render {
+            div(id:"personsInGroup", g.message(code: result.error.code, args: result.error.args) )
+        }
+
     }