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

Timestamp:

Oct 8, 2009, 7:58:38 PM (16 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/TaskProcedureDetailedController.groovy (modified) (6 diffs)

trunk/grails-app/controllers/TaskProcedureDetailedController.groovy

@@ -2 +2 @@
 
 class TaskProcedureDetailedController extends BaseController {
-    
+
     def index = { redirect(action:list,params:params) }
 
@@ -10 +10 @@
     def list = {
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ taskProcedureInstanceList: TaskProcedure.list( params ), taskProcedureInstanceTotal: TaskProcedure.count() ]
+
+        if(!params.filter)
+        { return [taskProcedureInstanceList: TaskProcedure.list(params), taskProcedureInstanceTotal: TaskProcedure.count()] }
+
+        // filterPane:
+        return[ taskProcedureInstanceList: filterService.filter( params, TaskProcedure ),
+            taskProcedureInstanceTotal: filterService.count( params, TaskProcedure ),
+            filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params),
+            params:params ]
     }
-        
+
     def search = {
         redirect(action:list)
@@ -18 +26 @@
 
     def show = {
+
+        // In the case of an actionSubmit button, rewrite action name from 'index'.
+        if(params._action_Show)
+        { params.action='show' }
+
         def taskProcedureInstance = TaskProcedure.get( params.id )
 
@@ -47 +60 @@
 
     def edit = {
+
+        // In the case of an actionSubmit button, rewrite action name from 'index'.
+        if(params._action_Edit)
+        { params.action='edit' }
+
         def taskProcedureInstance = TaskProcedure.get( params.id )
 
@@ -64 +82 @@
                 def version = params.version.toLong()
                 if(taskProcedureInstance.version > version) {
-                    
+
                     taskProcedureInstance.errors.rejectValue("version", "taskProcedure.optimistic.locking.failure", "Another user has updated this TaskProcedure while you were editing.")
                     render(view:'edit',model:[taskProcedureInstance:taskProcedureInstance])
@@ -86 +104 @@
 
     def create = {
-                def taskInstance = Task.get(params.taskInstance?.id)
-                
-        def taskProcedureInstance = new TaskProcedure()
-        taskProcedureInstance.properties = params
-        return ['taskProcedureInstance':taskProcedureInstance,
-                                                taskInstance: taskInstance]
+        if(params.taskInstance?.id) {
+            def taskInstance = Task.get(params.taskInstance.id)
+
+            def taskProcedureInstance = new TaskProcedure()
+            taskProcedureInstance.properties = params
+            return ['taskProcedureInstance':taskProcedureInstance,
+                            taskInstance: taskInstance]
+        } else {
+            flash.message = "Please select a task, then the Procedure tab.'"
+            redirect(controller:"taskDetailed", action:"list")
+        }
     }
 
     def save = {
         def taskProcedureInstance = new TaskProcedure(params)
-                def taskInstance = Task.get(params.taskInstance.id)
-                                
+        def taskInstance = Task.get(params.taskInstance.id)
+
         if(!taskProcedureInstance.hasErrors() && taskProcedureInstance.save()) {
-                        taskProcedureInstance.addToTasks(taskInstance)
-            flash.message = "TaskProcedure ${taskProcedureInstance.id} created"
+            taskProcedureInstance.addToTasks(taskInstance)
+            flash.message = "TaskProcedure ${taskProcedureInstance.id} created."
             redirect(action:show,id:taskProcedureInstance.id)
         }
         else {
-            render(view:'create',model:[taskProcedureInstance:taskProcedureInstance])
+            render(view:'create',model:[taskProcedureInstance:taskProcedureInstance, taskInstance: taskInstance])
         }
     }