Ignore:
Timestamp:
May 7, 2011, 12:42:44 PM (14 years ago)
Author:
gav
Message:

Svn merge -r874:r919 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

  • branches/features/purchaseOrders/grails-app/controllers/AssetDetailedController.groovy

    r885 r920  
    164164        if(params?.format && params.format != "html") {
    165165
    166             def dateFmt = { date ->
    167                 formatDate(format: "EEE, dd-MMM-yyyy", date: date)
     166            def dateFmt = { domain, value ->
     167                formatDate(format: "EEE, dd-MMM-yyyy", date: value)
    168168            }
    169169
    170 //             def fmtAsset = { m ->
     170//             def fmtAsset = { d, m ->
    171171//                     def r = ''
    172172//                     def assetInstance = Asset.findByName(m)
     
    184184//             }
    185185
    186 //             def fmtSubAsset = { m ->
     186//             def fmtSubAsset = { d, m ->
    187187//                     def r = ''
    188188//                     m.each() {
Note: See TracChangeset for help on using the changeset viewer.