fix for GRAILS-6081 "Allow overriding of plugins views and templates"

Author: graemerocher

src/java/org/codehaus/groovy/grails/plugins/web/taglib/RenderTagLib.groovy

@@ -478,8 +478,9 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants
         if(t==null) {
             def contextPath = attrs.contextPath ? attrs.contextPath : null
 
-            if(attrs.plugin) {
-                contextPath = pluginManager?.getPluginPath(attrs.plugin) ?: ''
+            def pluginName = attrs.plugin
+            if(pluginName) {
+                contextPath = pluginManager?.getPluginPath(pluginName) ?: ''
             }
             else if (contextPath == null) {
             	if(uri.startsWith("/plugins/")) contextPath = ""
@@ -488,14 +489,21 @@ class RenderTagLib implements com.opensymphony.module.sitemesh.RequestConstants
             	}            
             }
             def templatePath = "${contextPath}${uri}"
+            def templateResolveOrder
+            if(pluginName) {
+            	templateResolveOrder = [templatePath, "${contextPath}/grails-app/views/${uri}"]
+            }
+            else {
+            	templateResolveOrder = [uri, templatePath, "${contextPath}/grails-app/views/${uri}"]
+            }
 
-            t = engine.createTemplateForUri([templatePath, "${contextPath}/grails-app/views/${uri}"] as String[])
-			  if(!engine.isReloadEnabled() && t!=null) {
+            t = engine.createTemplateForUri(templateResolveOrder as String[])
+			if(!engine.isReloadEnabled() && t!=null) {
 				  def prevt = TEMPLATE_CACHE.putIfAbsent(uri, t)
 				  if(prevt != null) {
 					  t = prevt
 				  }
-			  }
+			}
         }
 
         if(!t) {

src/test/org/codehaus/groovy/grails/web/taglib/RenderTagLibTests.groovy

@@ -98,19 +98,22 @@ class RenderTagLibTests extends AbstractGrailsTagTests {
 
         resourceLoader.registerMockResource('/foo/book/_book.gsp', 'foo ${foo}: ${body()}')
         resourceLoader.registerMockResource("/plugins/controllers-${GrailsUtil.grailsVersion}/foo/book/_book.gsp".toString(), 'plugin foo ${foo}: ${body()}')
+        resourceLoader.registerMockResource("/plugins/controllers-${GrailsUtil.grailsVersion}/foo/book/_two.gsp".toString(), 'plugin foo ${foo}: ${body()}')
 
 
         template = '<g:render plugin="controllers" template="/foo/book/book" model="[foo: \'bar\']">hello</g:render>'
         assertOutputEquals 'plugin foo bar: hello', template
 
         template = '<g:render contextPath="" template="/foo/book/book" model="[foo: \'bar\']">hello</g:render>'
 
+        assertOutputEquals 'foo bar: hello', template
+        	
         request.setAttribute(GrailsApplicationAttributes.PAGE_SCOPE, new GroovyPageBinding("/plugins/controllers-${GrailsUtil.grailsVersion}"))
-        assertOutputEquals 'plugin foo bar: hello', template
+        assertOutputEquals 'foo bar: hello', template // application template should be able to override plugin template
+        template = '<g:render contextPath="" template="/foo/book/two" model="[foo: \'bar\']">hello</g:render>'
 
+        assertOutputEquals 'plugin foo bar: hello', template // should resolve to plugin template
         request.removeAttribute GrailsApplicationAttributes.PAGE_SCOPE
-
-        assertOutputEquals 'foo bar: hello', template
     }
 
     void testRenderTagWithBody() {