GRAILS-11167 g:include tag is not namespace aware

lhotari · lhotari · commit eaf8da18796c · 2014-03-04T12:09:15.000+02:00
- adds also plugin aware support
- changes made also to forward method
diff --git a/grails-plugin-controllers/src/main/groovy/org/codehaus/groovy/grails/web/metaclass/ForwardMethod.groovy b/grails-plugin-controllers/src/main/groovy/org/codehaus/groovy/grails/web/metaclass/ForwardMethod.groovy
@@ -62,6 +62,14 @@ class ForwardMethod {
             if(params.action) {
                 urlInfo.actionName = convert(webRequest, params.action)
             }
+            
+            if(params.namespace) {
+                urlInfo.namespace = params.namespace
+            }
+            
+            if(params.plugin) {
+                urlInfo.pluginName = params.plugin
+            }
         }
          
         def model = params.model instanceof Map ? params.model : Collections.EMPTY_MAP
diff --git a/grails-plugin-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/taglib/RenderTagLib.groovy b/grails-plugin-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/taglib/RenderTagLib.groovy
@@ -89,7 +89,12 @@ class RenderTagLib implements RequestConstants {
                     view: attrs.view,
                     id: attrs.id,
                     params: attrs.params)
-
+            if (attrs.namespace != null) {
+                mapping.namespace = attrs.namespace
+            }
+            if (attrs.plugin != null) {
+                mapping.pluginName = attrs.plugin
+            }
             out << WebUtils.includeForUrlMappingInfo(request, response, mapping, attrs.model ?: [:])?.content
         }
     }
diff --git a/grails-plugin-url-mappings/src/main/groovy/org/codehaus/groovy/grails/web/mapping/filter/UrlMappingsFilter.java b/grails-plugin-url-mappings/src/main/groovy/org/codehaus/groovy/grails/web/mapping/filter/UrlMappingsFilter.java
@@ -188,7 +188,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
                         info.configure(webRequest);
                         UrlConverter urlConverterToUse = urlConverter;
                         GrailsApplication grailsApplicationToUse = application;
-                        GrailsClass controller = WebUtils.getConfiguredControllerForUrlMappingInfo(webRequest, info, urlConverterToUse, grailsApplicationToUse);
+                        GrailsClass controller = WebUtils.passControllerForUrlMappingInfoInRequest(webRequest, info, urlConverterToUse, grailsApplicationToUse);
 
                         if(controller == null && info.getViewName()==null && info.getURI()==null) continue;
                     }
diff --git a/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/ErrorHandlingServlet.java b/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/ErrorHandlingServlet.java
@@ -145,7 +145,7 @@ protected void doDispatch(final HttpServletRequest request, final HttpServletRes
             WrappedResponseHolder.setWrappedResponse(response);
             String viewName = urlMappingInfo.getViewName();
             if (viewName == null || viewName.endsWith(GSP_SUFFIX) || viewName.endsWith(JSP_SUFFIX)) {
-                GrailsClass controller = WebUtils.getConfiguredControllerForUrlMappingInfo( webRequest, urlMappingInfo,
+                GrailsClass controller = WebUtils.passControllerForUrlMappingInfoInRequest( webRequest, urlMappingInfo,
                                                                                             webRequest.getApplicationContext().getBean(UrlConverter.BEAN_NAME, UrlConverter.class),
                                                                                             webRequest.getAttributes().getGrailsApplication());
                 if(controller != null) {
diff --git a/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/AbstractGrailsControllerHelper.java b/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/AbstractGrailsControllerHelper.java
@@ -138,17 +138,14 @@ public ModelAndView handleURI(final String originalUri, GrailsWebRequest grailsW
 
         // Step 2: lookup the controller in the application.
         GrailsControllerClass controllerClass=null;
-        if (!WebUtils.isIncludeRequest(request) && request.getAttribute(FORWARD_IN_PROGRESS) == null) {
-
-            Object attribute = grailsWebRequest.getAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS, WebRequest.SCOPE_REQUEST);
-            if (attribute instanceof GrailsControllerClass) {
-                controllerClass = (GrailsControllerClass)attribute;
-                Boolean canUse = (Boolean)grailsWebRequest.getAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS_AVAILABLE, WebRequest.SCOPE_REQUEST);
-                if(canUse == null) {
-                    controllerClass = null;
-                } else {
-                    grailsWebRequest.removeAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS_AVAILABLE, WebRequest.SCOPE_REQUEST);
-                }
+        Object attribute = grailsWebRequest.getAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS, WebRequest.SCOPE_REQUEST);
+        if (attribute instanceof GrailsControllerClass) {
+            controllerClass = (GrailsControllerClass)attribute;
+            Boolean canUse = (Boolean)grailsWebRequest.getAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS_AVAILABLE, WebRequest.SCOPE_REQUEST);
+            if(canUse == null) {
+                controllerClass = null;
+            } else {
+                grailsWebRequest.removeAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS_AVAILABLE, WebRequest.SCOPE_REQUEST);
             }
         }
 
diff --git a/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/util/WebUtils.java b/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/util/WebUtils.java
@@ -38,6 +38,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import grails.web.CamelCaseUrlConverter;
 import grails.web.UrlConverter;
 import groovy.lang.Binding;
 import org.apache.commons.lang.StringUtils;
@@ -54,6 +55,7 @@
 import org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequest;
 import org.codehaus.groovy.grails.web.servlet.mvc.exceptions.ControllerExecutionException;
 import org.codehaus.groovy.grails.web.sitemesh.GrailsLayoutDecoratorMapper;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.util.Assert;
 import org.springframework.web.context.WebApplicationContext;
@@ -325,12 +327,33 @@ public static String forwardRequestForUrlMappingInfo(HttpServletRequest request,
         // responsibility for rendering the response.
         final GrailsWebRequest webRequest = GrailsWebRequest.lookup(request);
         webRequest.removeAttribute(GrailsApplicationAttributes.MODEL_AND_VIEW, 0);
-        webRequest.setActionName(info.getActionName());
-
+        info.configure(webRequest);
+        passControllerForForwardedRequest(webRequest, info);
         dispatcher.forward(request, response);
         return forwardUrl;
     }
 
+    protected static void passControllerForForwardedRequest(final GrailsWebRequest webRequest,
+            UrlMappingInfo info) {
+        webRequest.removeAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS_AVAILABLE, WebRequest.SCOPE_REQUEST);
+        if (info.getViewName() == null && info.getURI() == null) {
+            GrailsApplication grailsApplicationToUse = webRequest.getAttributes().getGrailsApplication();
+            if(grailsApplicationToUse != null) {
+                WebUtils.passControllerForUrlMappingInfoInRequest(webRequest, info, locateUrlConverter(webRequest), grailsApplicationToUse);
+            }
+        }
+    }
+
+    private static UrlConverter locateUrlConverter(final GrailsWebRequest webRequest) {
+        UrlConverter urlConverter = null;
+        try {
+            urlConverter = webRequest.getAttributes().getApplicationContext().getBean("grailsUrlConverter", UrlConverter.class);
+        } catch (NoSuchBeanDefinitionException e) {
+            urlConverter = new CamelCaseUrlConverter();
+        }
+        return urlConverter;
+    }
+
     /**
      * Include whatever the given UrlMappingInfo maps to within the current response
      *
@@ -380,6 +403,7 @@ public static IncludedContent includeForUrlMappingInfo(HttpServletRequest reques
                 info.configure(webRequest);
                 webRequest.getParameterMap().putAll(info.getParameters());
                 webRequest.removeAttribute(GrailsApplicationAttributes.MODEL_AND_VIEW, 0);
+                passControllerForForwardedRequest(webRequest, info);
             }
             return includeForUrl(includeUrl, request, response, model);
         }
@@ -710,25 +734,29 @@ public static String getForwardURI(HttpServletRequest request) {
         return result;
     }
 
+    @Deprecated
     public static GrailsClass getConfiguredControllerForUrlMappingInfo(GrailsWebRequest webRequest, UrlMappingInfo info, UrlConverter urlConverterToUse, GrailsApplication grailsApplicationToUse) {
-        String viewName;
-        viewName = info.getViewName();
+        return passControllerForUrlMappingInfoInRequest(webRequest, info, urlConverterToUse, grailsApplicationToUse);
+    }
 
-        GrailsClass controller = null;
-        if (viewName == null && info.getURI() == null) {
+    public static GrailsClass passControllerForUrlMappingInfoInRequest(GrailsWebRequest webRequest, UrlMappingInfo info, UrlConverter urlConverterToUse, GrailsApplication grailsApplicationToUse) {
+        if (info.getViewName() == null && info.getURI() == null) {
             ControllerArtefactHandler.ControllerCacheKey featureId = getFeatureId(urlConverterToUse, info);
-            controller = grailsApplicationToUse.getArtefactForFeature(ControllerArtefactHandler.TYPE, featureId);
+            GrailsClass controller = grailsApplicationToUse.getArtefactForFeature(ControllerArtefactHandler.TYPE, featureId);
             if (controller != null) {
-
                 webRequest.setAttribute(GrailsApplicationAttributes.CONTROLLER_NAME_ATTRIBUTE, controller.getLogicalPropertyName(), WebRequest.SCOPE_REQUEST);
                 webRequest.setAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS, controller, WebRequest.SCOPE_REQUEST);
                 webRequest.setAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS_AVAILABLE, Boolean.TRUE, WebRequest.SCOPE_REQUEST);
+            } else {
+                webRequest.removeAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS_AVAILABLE, WebRequest.SCOPE_REQUEST);
             }
-
+            return controller;
+        } else {
+            webRequest.removeAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS_AVAILABLE, WebRequest.SCOPE_REQUEST);
+            return null;
         }
-        return controller;
     }
-
+    
     public static ControllerArtefactHandler.ControllerCacheKey getFeatureId(UrlConverter urlConverter, UrlMappingInfo info) {
         final String action = info.getActionName() == null ? "" : info.getActionName();
         final String controllerName = info.getControllerName();

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,14 @@ class ForwardMethod {`
`62`	`62`	`if(params.action) {`
`63`	`63`	`urlInfo.actionName = convert(webRequest, params.action)`
`64`	`64`	`}`
	`65`	`+`
	`66`	`+ if(params.namespace) {`
	`67`	`+ urlInfo.namespace = params.namespace`
	`68`	`+ }`
	`69`	`+`
	`70`	`+ if(params.plugin) {`
	`71`	`+ urlInfo.pluginName = params.plugin`
	`72`	`+ }`
`65`	`73`	`}`
`66`	`74`
`67`	`75`	`def model = params.model instanceof Map ? params.model : Collections.EMPTY_MAP`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,12 @@ class RenderTagLib implements RequestConstants {`
`89`	`89`	`view: attrs.view,`
`90`	`90`	`id: attrs.id,`
`91`	`91`	`params: attrs.params)`
`92`		`-`
	`92`	`+ if (attrs.namespace != null) {`
	`93`	`+ mapping.namespace = attrs.namespace`
	`94`	`+ }`
	`95`	`+ if (attrs.plugin != null) {`
	`96`	`+ mapping.pluginName = attrs.plugin`
	`97`	`+ }`
`93`	`98`	`out << WebUtils.includeForUrlMappingInfo(request, response, mapping, attrs.model ?: [:])?.content`
`94`	`99`	`}`
`95`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse`
`188`	`188`	`info.configure(webRequest);`
`189`	`189`	`UrlConverter urlConverterToUse = urlConverter;`
`190`	`190`	`GrailsApplication grailsApplicationToUse = application;`
`191`		`- GrailsClass controller = WebUtils.getConfiguredControllerForUrlMappingInfo(webRequest, info, urlConverterToUse, grailsApplicationToUse);`
	`191`	`+ GrailsClass controller = WebUtils.passControllerForUrlMappingInfoInRequest(webRequest, info, urlConverterToUse, grailsApplicationToUse);`
`192`	`192`
`193`	`193`	`if(controller == null && info.getViewName()==null && info.getURI()==null) continue;`
`194`	`194`	`}`