Ignore:
Timestamp:
May 1, 2011, 12:46:31 PM (8 years ago)
Author:
gav
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/grails-app/controllers/TaskProcedureDetailedController.groovy

    r813 r913  
    1717        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
    1818
    19         if(!params.filter)
    20         { return [taskProcedureInstanceList: TaskProcedure.list(params), taskProcedureInstanceTotal: TaskProcedure.count()] }
     19        def taskProcedureInstanceList
     20        def taskProcedureInstanceTotal
     21        def filterParams = com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params)
     22
     23        if(params.filter) {
     24            taskProcedureInstanceList = filterService.filter( params, TaskProcedure )
     25            taskProcedureInstanceTotal = filterService.count( params, TaskProcedure )
     26        }
     27        else {
     28            taskProcedureInstanceList = TaskProcedure.list(params)
     29            taskProcedureInstanceTotal = TaskProcedure.count()
     30        }
    2131
    2232        // filterPane:
    23         return[ taskProcedureInstanceList: filterService.filter( params, TaskProcedure ),
    24             taskProcedureInstanceTotal: filterService.count( params, TaskProcedure ),
    25             filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params),
    26             params:params ]
     33        return[ taskProcedureInstanceList: taskProcedureInstanceList,
     34            taskProcedureInstanceTotal: taskProcedureInstanceTotal,
     35            filterParams: filterParams,
     36            params: params ]
    2737    }
    2838
Note: See TracChangeset for help on using the changeset viewer.