Changeset 886 for branches

Timestamp:

Apr 15, 2011, 4:55:48 AM (14 years ago)

Author:

gav

Message:

Fix null pointer bug in TaskProcedure list view.
Does not appear affect Grails-1.2.2.

Location:

branches/features/grailsUpgrade/grails-app

Files:

• controllers/TaskProcedureDetailedController.groovy (modified) (1 diff)
• views/taskProcedureDetailed/list.gsp (modified) (1 diff)

branches/features/grailsUpgrade/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 ]
     }
 

branches/features/grailsUpgrade/grails-app/views/taskProcedureDetailed/list.gsp

@@ -36 +36 @@
                             <tr>
 
-                                <g:sortableColumn property="id" title="Id"  params="${filterParams}" />
+                                <g:sortableColumn property="id" title="Id" params="${filterParams}" />
                                 <th>Description</th>
                                 <th>Asset</th>