Changeset 913 for trunk/grails-app/controllers

Timestamp:

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

Author:

gav

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• grails-app/controllers/AppCoreController.groovy (modified) (1 diff)
• grails-app/controllers/AssetDetailedController.groovy (modified) (3 diffs)
• grails-app/controllers/AssetSubItemDetailedController.groovy (modified) (1 diff)
• grails-app/controllers/InventoryItemDetailedController.groovy (modified) (2 diffs)
• grails-app/controllers/InventoryItemPurchaseDetailedController.groovy (modified) (1 diff)
• grails-app/controllers/TaskDetailedController.groovy (modified) (2 diffs)
• grails-app/controllers/TaskProcedureDetailedController.groovy (modified) (1 diff)

trunk/grails-app/controllers/AppCoreController.groovy

@@ -58 +58 @@
 
         // Build the plugins string.
-        def pluginProperties = grailsApplication.metadata.findAll {it.key.contains('plugin')}
-        pluginProperties.each() {
-            it.key = WordUtils.capitalize( (it.key + GString.EMPTY).split("\\.")[-1] )
-        }
-        pluginProperties = pluginProperties.sort { p1, p2 -> p1.key.compareToIgnoreCase(p2.key) }
-        def plugins = pluginProperties.collect{ it.key + '-' + it.value }.join(", ")
+        def userPlugins = org.codehaus.groovy.grails.plugins.PluginManagerHolder.pluginManager.userPlugins 
+
+        userPlugins = userPlugins.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+
+        def plugins = userPlugins.collect{
+            WordUtils.capitalize(it.name) + '-' + it.version
+        }.join(", ")
 
         def sections = Section.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }

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() {

trunk/grails-app/controllers/AssetSubItemDetailedController.groovy

@@ -60 +60 @@
         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)
             }
 

trunk/grails-app/controllers/InventoryItemDetailedController.groovy

@@ -292 +292 @@
         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)
             }
 
@@ -646 +646 @@
         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)
             }
 

trunk/grails-app/controllers/InventoryItemPurchaseDetailedController.groovy

@@ -142 +142 @@
         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)
             }
 

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -147 +147 @@
         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)
             }
 
@@ -308 +308 @@
         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)
             }
 

trunk/grails-app/controllers/TaskProcedureDetailedController.groovy

@@ -17 +17 @@
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
 
-        if(!params.filter)
-        { return [taskProcedureInstanceList: TaskProcedure.list(params), taskProcedureInstanceTotal: TaskProcedure.count()] }
+        def taskProcedureInstanceList
+        def taskProcedureInstanceTotal
+        def filterParams = com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params)
+
+        if(params.filter) {
+            taskProcedureInstanceList = filterService.filter( params, TaskProcedure )
+            taskProcedureInstanceTotal = filterService.count( params, TaskProcedure )
+        }
+        else {
+            taskProcedureInstanceList = TaskProcedure.list(params)
+            taskProcedureInstanceTotal = TaskProcedure.count()
+        }
 
         // filterPane:
-        return[ taskProcedureInstanceList: filterService.filter( params, TaskProcedure ),
-            taskProcedureInstanceTotal: filterService.count( params, TaskProcedure ),
-            filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params),
-            params:params ]
+        return[ taskProcedureInstanceList: taskProcedureInstanceList,
+            taskProcedureInstanceTotal: taskProcedureInstanceTotal,
+            filterParams: filterParams,
+            params: params ]
     }