Ignore:
Timestamp:
May 22, 2011, 12:29:29 AM (13 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/features/purchaseOrders

    • Property svn:ignore
      •  

        old new  
        11*.log*
        22*.war
         3*.iml
         4*.ipr
         5*.iws
        36target
         7out
        48.directory
        5 
        6 *.iml
    • Property svn:mergeinfo changed
      /trunkmerged: 921-923,​932-936,​939-941
  • branches/features/purchaseOrders/grails-app/controllers/TaskDetailedController.groovy

    r920 r942  
    888888    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_TaskManager', 'ROLE_TaskUser'])
    889889    def workLoad= {
     890        def filterParams = [:]
    890891        def result = taskSearchService.getWorkLoad(params, RCU.getLocale(request))
    891892
     
    900901                    workLoadGroups: result.workLoadGroups,
    901902                    totalHours: result.totalHours,
    902                     totalMinutes: result.totalMinutes]
     903                    totalMinutes: result.totalMinutes,
     904                    filterParams: filterParams]
    903905    } // workLoad
    904906
Note: See TracChangeset for help on using the changeset viewer.