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/AssetDetailedController.groovy

    r749 r913  
    4444    }
    4545
     46    /**
     47    * Build and return the compact asset tree response.
     48    */
     49    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
     50    def assetTreeCompact = {
     51        def assetInstance = Asset.read(params.id)
     52        if(!assetInstance) {
     53            render g.message(code: 'default.not.found', args: ['Asset',params.id])
     54            return
     55        }
     56
     57        render(template:"/shared/assetTreeCompact", model:['assetInstance':assetInstance])
     58    }
     59
    4660    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
    4761    def exportAssetTreeHtml = {
     
    150164        if(params?.format && params.format != "html") {
    151165
    152             def dateFmt = { date ->
    153                 formatDate(format: "EEE, dd-MMM-yyyy", date: date)
     166            def dateFmt = { domain, value ->
     167                formatDate(format: "EEE, dd-MMM-yyyy", date: value)
    154168            }
    155169
    156 //             def fmtAsset = { m ->
     170//             def fmtAsset = { d, m ->
    157171//                     def r = ''
    158172//                     def assetInstance = Asset.findByName(m)
     
    170184//             }
    171185
    172 //             def fmtSubAsset = { m ->
     186//             def fmtSubAsset = { d, m ->
    173187//                     def r = ''
    174188//                     m.each() {
Note: See TracChangeset for help on using the changeset viewer.