Changeset 920 for branches/features/purchaseOrders/grails-app/controllers

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:

• . (modified) (1 prop)
• grails-app/controllers/AppCoreController.groovy (modified) (1 diff)
• grails-app/controllers/AssetDetailedController.groovy (modified) (2 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)

branches/features/purchaseOrders/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) }

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

@@ -164 +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)
@@ -184 +184 @@
 //             }
 
-//             def fmtSubAsset = { m ->
+//             def fmtSubAsset = { d, m ->
 //                     def r = ''
 //                     m.each() {

branches/features/purchaseOrders/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)
             }
 

branches/features/purchaseOrders/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)
             }
 

branches/features/purchaseOrders/grails-app/controllers/InventoryItemPurchaseDetailedController.groovy

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

branches/features/purchaseOrders/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)
             }