Changeset 147 for trunk/grails-app/controllers/AssignedPersonDetailedController.groovy

Timestamp:

Oct 8, 2009, 7:58:38 PM (15 years ago)

Author:

gav

Message:

Re-install class-diagram from local svn build with patch to allow war deployment.
Class-diagram overrides removed from Config.groovy since these have all been included upstream.
Tidy comments in SecurityConfig?.groovy
Some work on adding assignedPerson work flow and PersonController?.
Add navAlt and filterPane search to Person and TaskProcedure?.

File:

• trunk/grails-app/controllers/AssignedPersonDetailedController.groovy (modified) (4 diffs)

trunk/grails-app/controllers/AssignedPersonDetailedController.groovy

@@ -2 +2 @@
 
 class AssignedPersonDetailedController extends BaseController {
-    
+
     def index = { redirect(action:list,params:params) }
 
@@ -27 +27 @@
         if(assignedPersonInstance) {
             try {
+                def taskId = assignedPersonInstance.task.id
                 assignedPersonInstance.delete()
                 flash.message = "AssignedPerson ${params.id} deleted"
-                redirect(action:list)
+                redirect(controller:"taskDetailed", action:"show", id: taskId)
             }
             catch(org.springframework.dao.DataIntegrityViolationException e) {
@@ -60 +61 @@
                 def version = params.version.toLong()
                 if(assignedPersonInstance.version > version) {
-                    
+
                     assignedPersonInstance.errors.rejectValue("version", "assignedPerson.optimistic.locking.failure", "Another user has updated this AssignedPerson while you were editing.")
                     render(view:'edit',model:[assignedPersonInstance:assignedPersonInstance])
@@ -82 +83 @@
 
     def create = {
-                if(!params.task?.id) {
-                        flash.message = "Please select a task and then 'Add Assigned Person'"
-                        redirect(controller: "taskDetailed", action: list)
-                }
-                else {
-        def assignedPersonInstance = new AssignedPerson()
-        assignedPersonInstance.properties = params
-        return ['assignedPersonInstance':assignedPersonInstance]
-                }
+        if(!params.task?.id) {
+            flash.message = "Please select a task and then 'Add Assigned Person'"
+            redirect(controller: "taskDetailed", action: list)
+        }
+        else {
+            def assignedPersonInstance = new AssignedPerson()
+            assignedPersonInstance.properties = params
+            return ['assignedPersonInstance':assignedPersonInstance]
+        }
     }
 
     def save = {
         def assignedPersonInstance = new AssignedPerson(params)
+
         if(!assignedPersonInstance.hasErrors() && assignedPersonInstance.save()) {
             flash.message = "AssignedPerson ${assignedPersonInstance.id} created"
-            redirect(action:show,id:assignedPersonInstance.id)
+            redirect(controller:"taskDetailed", action:"show", id: params.task.id)
         }
         else {