Changeset 942 for branches/features/purchaseOrders/grails-app/controllers

Timestamp:

May 22, 2011, 12:29:29 AM (14 years ago)

Author:

gav

Message:

Svn merge -r920:r941 trunk/ into branches/features/purchaseOrders.
This brings the purchaseOrder branch fully up to date.

Location:

branches/features/purchaseOrders

Files:

• . (modified) (2 props)
• grails-app/controllers/TaskDetailedController.groovy (modified) (2 diffs)

branches/features/purchaseOrders

@@ -1 +1 @@
 *.log*
 *.war
+*.iml
+*.ipr
+*.iws
 target
+out
 .directory
-
-*.iml

@@ -1 +1 @@
 *.log*
 *.war
+*.iml
+*.ipr
+*.iws
 target
+out
 .directory
-
-*.iml

branches/features/purchaseOrders/grails-app/controllers/TaskDetailedController.groovy

@@ -888 +888 @@
     @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_TaskManager', 'ROLE_TaskUser'])
     def workLoad= {
+        def filterParams = [:]
         def result = taskSearchService.getWorkLoad(params, RCU.getLocale(request))
 
@@ -900 +901 @@
                     workLoadGroups: result.workLoadGroups,
                     totalHours: result.totalHours,
-                    totalMinutes: result.totalMinutes]
+                    totalMinutes: result.totalMinutes,
+                    filterParams: filterParams]
     } // workLoad
 

@@ -1 +1 @@
 *.log*
 *.war
+*.iml
+*.ipr
+*.iws
 target
+out
 .directory
-
-*.iml