add support for "redirect:" views in standalone GSP

grails · Apr 11, 2014 · fa3b252 · fa3b252
1 parent 67e8079
commit fa3b252
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/grails-web-common/src/main/groovy/org/codehaus/groovy/grails/web/util/WebUtils.java b/grails-web-common/src/main/groovy/org/codehaus/groovy/grails/web/util/WebUtils.java
@@ -51,6 +51,7 @@
 import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.handler.WebRequestHandlerInterceptorAdapter;
+import org.springframework.web.servlet.view.UrlBasedViewResolver;
 import org.springframework.web.util.UrlPathHelper;
 
 /**
@@ -181,6 +182,9 @@ public static String addViewPrefix(String viewName) {
 
     public static String addViewPrefix(String viewName, String controllerName) {
         if (!viewName.startsWith(String.valueOf(SLASH))) {
+            if(viewName.startsWith(UrlBasedViewResolver.REDIRECT_URL_PREFIX) || viewName.startsWith(UrlBasedViewResolver.FORWARD_URL_PREFIX)) {
+                return viewName;
+            }
             StringBuilder buf = new StringBuilder();
             buf.append(SLASH);
             if (controllerName != null) {

diff --git a/...src/main/groovy/org/codehaus/groovy/grails/web/servlet/view/GrailsLayoutViewResolver.java b/...src/main/groovy/org/codehaus/groovy/grails/web/servlet/view/GrailsLayoutViewResolver.java
@@ -26,6 +26,7 @@
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.Ordered;
 import org.springframework.web.context.ServletConfigAware;
+import org.springframework.web.servlet.SmartView;
 import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.ViewResolver;
 
@@ -41,7 +42,12 @@ public GrailsLayoutViewResolver(ViewResolver innerViewResolver, GroovyPageLayout
 
     @Override
     public View resolveViewName(String viewName, Locale locale) throws Exception {
-        return new GrailsLayoutView(groovyPageLayoutFinder, innerViewResolver.resolveViewName(viewName, locale));
+        View innerView = innerViewResolver.resolveViewName(viewName, locale);
+        if(innerView instanceof SmartView && ((SmartView)innerView).isRedirectView()) { 
+            return innerView;
+        } else {
+            return new GrailsLayoutView(groovyPageLayoutFinder, innerView);
+        }
     }
 
     @Override