Changeset 913 for trunk/grails-app/controllers/AssetDetailedController.groovy

Timestamp:

May 1, 2011, 12:46:31 PM (13 years ago)

Author:

gav

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• grails-app/controllers/AssetDetailedController.groovy (modified) (3 diffs)

trunk/grails-app/controllers/AssetDetailedController.groovy

@@ -44 +44 @@
     }
 
+    /**
+    * Build and return the compact asset tree response.
+    */
+    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
+    def assetTreeCompact = {
+        def assetInstance = Asset.read(params.id)
+        if(!assetInstance) {
+            render g.message(code: 'default.not.found', args: ['Asset',params.id])
+            return
+        }
+
+        render(template:"/shared/assetTreeCompact", model:['assetInstance':assetInstance])
+    }
+
     @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
     def exportAssetTreeHtml = {
@@ -150 +164 @@
         if(params?.format && params.format != "html") {
 
-            def dateFmt = { date ->
-                formatDate(format: "EEE, dd-MMM-yyyy", date: date)
+            def dateFmt = { domain, value ->
+                formatDate(format: "EEE, dd-MMM-yyyy", date: value)
             }
 
-//             def fmtAsset = { m ->
+//             def fmtAsset = { d, m ->
 //                     def r = ''
 //                     def assetInstance = Asset.findByName(m)
@@ -170 +184 @@
 //             }
 
-//             def fmtSubAsset = { m ->
+//             def fmtSubAsset = { d, m ->
 //                     def r = ''
 //                     m.each() {