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

Timestamp:

May 1, 2011, 12:46:31 PM (14 years ago)

Author:

gav

Message:

Svn merge -r875:r911 branches/features/grailsUpgrade/ into trunk/.

Location:

trunk

Files:

• . (modified) (1 prop)
• grails-app/controllers/TaskProcedureDetailedController.groovy (modified) (1 diff)

trunk/grails-app/controllers/TaskProcedureDetailedController.groovy

@@ -17 +17 @@
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
 
-        if(!params.filter)
-        { return [taskProcedureInstanceList: TaskProcedure.list(params), taskProcedureInstanceTotal: TaskProcedure.count()] }
+        def taskProcedureInstanceList
+        def taskProcedureInstanceTotal
+        def filterParams = com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params)
+
+        if(params.filter) {
+            taskProcedureInstanceList = filterService.filter( params, TaskProcedure )
+            taskProcedureInstanceTotal = filterService.count( params, TaskProcedure )
+        }
+        else {
+            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 ]
+        return[ taskProcedureInstanceList: taskProcedureInstanceList,
+            taskProcedureInstanceTotal: taskProcedureInstanceTotal,
+            filterParams: filterParams,
+            params: params ]
     }