Changeset 913 for trunk/grails-app/controllers/AppCoreController.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/AppCoreController.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) }